chore: fix merge conflict

2019-10-21 10:33:10 -04:00 · 2019-10-21 10:33:10 -04:00 · 4abd8d29ef
commit 4abd8d29ef
parent 920773fc6b
1 changed files with 1 additions and 2 deletions
--- a/packages/compiler-core/src/parse.ts
+++ b/packages/compiler-core/src/parse.ts
@ -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)
  }
 }