From 0bf149f5a9c25dd82c0e7548299e0b88f3d05dc3 Mon Sep 17 00:00:00 2001
From: Shintaro Tanaka <s-tanaka@holmescloud.com>
Date: Sat, 5 Sep 2020 00:52:08 +0900
Subject: [PATCH] fix conflict resolution mistakes

---
 src/client/theme-default/components/Page.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/client/theme-default/components/Page.vue b/src/client/theme-default/components/Page.vue
index 7d1981a8..bf496041 100644
--- a/src/client/theme-default/components/Page.vue
+++ b/src/client/theme-default/components/Page.vue
@@ -8,8 +8,9 @@
 
 <script>
 import NextAndPrevLinks from './NextAndPrevLinks.vue'
+import PageEdit from './PageEdit.vue'
 export default {
-  components:{ NextAndPrevLinks }
+  components:{ NextAndPrevLinks, PageEdit }
 }
 </script>
 
@@ -36,9 +37,3 @@ export default {
   margin-top: 0;
 } */
 </style>
-<script>
-  import PageEdit from './PageEdit.vue'
-  export default {
-    components: { PageEdit }
-  }
-</script>
\ No newline at end of file