diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 8b8b832..d43e1d0 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -263,18 +263,10 @@
 }
 
 .headClass{
-<<<<<<< .mine
   // background-image: url('../resource/img/bj.png')  !important;
   // background-repeat: no-repeat;
   // background-size: 100% auto;
   // background-color: #eef3f8 !important;
   background: linear-gradient(to right, #e2edff, #eef3f8) !important;
-=======
-  // background-image: url('../resource/img/bj.png')  !important;
-  // background-repeat: no-repeat;
-  // background-size: 100% auto;
-  // background-color: #e5f5f9 !important;
-
->>>>>>> .theirs
 }
 </style>