From b07ccc6a5b69c63af38573943f93fe3515237cb7 Mon Sep 17 00:00:00 2001
From: hzw <405163706@qq.com>
Date: Fri, 28 Sep 2018 11:08:39 +0800
Subject: [PATCH] d

---
 src/App.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 75d85f6..8c25f40 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,16 +13,11 @@ html, body {
   width: 100%;
   height: 100%;
   color: #606c71;
-<<<<<<< HEAD
   padding: 0;
   margin: 0;
-=======
-  margin: 0;
-  padding: 0;
->>>>>>> d16215af17cfb3a79a7a3966247330113288389c
 }
 #app {
   width: 100%;
   height: 100%;
 }
-</style>
+</style>