feat: merge

vuestorefront · Nov 21, 2019 · 5e415ae · 5e415ae
1 parent f029d9e
commit 5e415ae
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/default-theme/pages/_.vue b/packages/default-theme/pages/_.vue
@@ -1,10 +1,6 @@
 <template>
  <div>
-<<<<<<< HEAD
  <component :is="getComponent" :cms-page="cmsPage"/>
-=======
- <component :is="getComponent" :cms-page="cmsPage" :product="product"/>
->>>>>>> demo
  </div>
 </template>
 <script>