]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: fix merge conflict
authorEvan You <yyx990803@gmail.com>
Mon, 21 Oct 2019 14:33:10 +0000 (10:33 -0400)
committerEvan You <yyx990803@gmail.com>
Mon, 21 Oct 2019 14:33:10 +0000 (10:33 -0400)
packages/compiler-core/src/parse.ts

index 3d88f13f7b7b7dec2659efcb149e799da90a1ea0..b5a427db193dd8e634bb26cadbf32d3fbd369513 100644 (file)
@@ -99,8 +99,7 @@ export function parse(content: string, options: ParserOptions = {}): RootNode {
     hoists: [],
     cached: 0,
     codegenNode: undefined,
-    loc: getSelection(context, start),
-    cached: 0
+    loc: getSelection(context, start)
   }
 }