From 4abd8d29ef9baee62d2f5d917b79b0860221fe84 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Oct 2019 10:33:10 -0400
Subject: [PATCH] chore: fix merge conflict

---
 packages/compiler-core/src/parse.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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