app

src/App.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2021-11-15 21:11:28
+ * @LastEditTime: 2021-11-15 21:12:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\App.vue
@@ -21,10 +21,7 @@ export default {};
 /*每个页面公共css */
 @import "assets/styles/main.scss";
 #app {
-<<<<<<< HEAD
   // height: 800px;
-=======
->>>>>>> 7acfd8b793b806e0a1fb538c8082af86c450457a
   margin: 0;
   padding: 0;
   box-sizing: border-box;