'update'

src/layout/components/AppMain.vue

@@ -57,12 +57,9 @@ export default {
 		display:flex;justify-content:center;background-color:#fff;line-height:2;
 		&:after{
 			color:#888;display:inline-block;font-weight:bold;
-<<<<<<< HEAD
 			content:'©  ⋅ 技术支持：山东天地寰宇信息科技有限公司';
-=======
 			// content:'©  ⋅ 技术支持：山东天地寰宇';
-			content: attr(data-content)
->>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
+			//content: attr(data-content)
 		}
 	}
 </style>

src/views/home_manage.vue

@@ -319,11 +319,8 @@ export default {
 				//background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff);
 				background-image:-webkit-linear-gradient(top,#8affe1,#4193ff);
 				-webkit-background-clip:text;-webkit-text-fill-color:transparent;
-<<<<<<< HEAD
 				content:'©  ⋅ 技术支持：山东天地寰宇信息科技有限公司';
-=======
-				content:'©  ⋅ 技术支持：山东天地寰宇';
->>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
+				//content:'©  ⋅ 技术支持：山东天地寰宇';
 			}
 			img{display:none !important;}
 		}

src/views/home_manage_fly.vue

@@ -444,11 +444,8 @@ export default {
 				//background-image:-webkit-linear-gradient(top, #8fe9ff, #3d8aff);
 				background-image:-webkit-linear-gradient(top,#8affe1,#4193ff);
 				-webkit-background-clip:text;-webkit-text-fill-color:transparent;
-<<<<<<< HEAD
 				content:'©  ⋅ 技术支持：山东天地寰宇信息科技有限公司';
-=======
-				content:'©  ⋅ 技术支持：山东天地寰宇';
->>>>>>> 6f1b5fea3d8cf5d5a8c61fffcc1447d936fe0cf8
+				//content:'©  ⋅ 技术支持：山东天地寰宇';
 			}
 			img{display:none !important;}
 		}