From d4f4c15f10c8a609401fc64e1e0254bcec8cfb25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sun, 21 May 2017 19:24:31 +0200
Subject: [PATCH] Fix build merge

---
 lib/build.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/build.js b/lib/build.js
index cc1e2b610a..d6aec52959 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -223,10 +223,6 @@ async function generateRoutesAndFiles () {
     const files = await glob('pages/**/*.vue', {cwd: this.srcDir})
     templateVars.router.routes = createRoutes(files, this.srcDir)
   } else {
-<<<<<<< HEAD
-    this.createRoutes = this.createRoutes.bind(this)
-=======
->>>>>>> ac42ae599ec5878f0596305d4a4c9c195ff1e72c
     templateVars.router.routes = this.createRoutes(this.srcDir)
   }
   // router.extendRoutes method