From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Oct 2019 14:33:10 +0000 (-0400)
Subject: chore: fix merge conflict
X-Git-Tag: v3.0.0-alpha.0~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4abd8d29ef9baee62d2f5d917b79b0860221fe84;p=thirdparty%2Fvuejs%2Fcore.git

chore: fix merge conflict
---

diff --git a/packages/compiler-core/src/parse.ts b/packages/compiler-core/src/parse.ts
index 3d88f13f7b..b5a427db19 100644
--- 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)
   }
 }