d

frontHu · Sep 28, 2018 · b07ccc6 · b07ccc6
1 parent ab82580
commit b07ccc6
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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>