fixed 冲突

@@ -110,11 +110,7 @@
             display: block;
             width: 15px;
             height: 15px;
-<<<<<<< HEAD
-            background: resolve(img/home/pre-title.png);
-=======
             background: resolve(home/pre-title.png);
->>>>>>> feature/personal
             margin: 10px 10px 0;
         }
     }