Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-06 21:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build merge

Browse Source
This commit is contained in:
Sébastien Chopin 2017-05-21 19:24:31 +02:00
parent 0183ac4b86
commit d4f4c15f10
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/build.js
View File

@ -223,10 +223,6 @@ async function generateRoutesAndFiles () {
const files = await glob('pages/**/*.vue', {cwd: this.srcDir}) const files = await glob('pages/**/*.vue', {cwd: this.srcDir})
templateVars.router.routes = createRoutes(files, this.srcDir) templateVars.router.routes = createRoutes(files, this.srcDir)
} else { } else {
<<<<<<< HEAD
this.createRoutes = this.createRoutes.bind(this)
=======
>>>>>>> ac42ae599ec5878f0596305d4a4c9c195ff1e72c
templateVars.router.routes = this.createRoutes(this.srcDir) templateVars.router.routes = this.createRoutes(this.srcDir)
} }
// router.extendRoutes method // router.extendRoutes method