解决冲突

.gitignore

@@ -1 +0,0 @@
-.DS_Store

tajian/css/index.css

@@ -66,7 +66,7 @@ a:link{text-decoration:none;}
 
 
 /* 主内容 */
-.g_main_lay{padding:0 2% 0 3.4%;margin-top:18px;min-height:280px;position:relative;max-width:1700px;margin:0 auto;}
+.g_main_lay{padding:0 2% 0 3.4%;margin-top:18px;min-height:280px;position:relative;max-width:1700px;}
 .g_main_border{border-top:solid 1px #eeeeee;}
 .vl_list_main{float:left;width:25%;margin:10px 0 22px 0;position:relative}
 .video-menu-ow{border-bottom:1px solid rgba(0,0,0,.1)}
@@ -112,7 +112,7 @@ a:link{text-decoration:none;}
 }
 
 /* 个人中心 */
-.ui_name{border-top:solid 1px #eeeeee;padding:3% 0 0 0;margin-bottom:20px;display:flex;align-items: center;justify-content:center;}
+.ui_name{padding:3% 0 0 0;margin-bottom:20px;display:flex;align-items: center;justify-content:center;}
 .ui_name img{width:112px;border:solid 4px #e6e6e6;border-radius:50%;}
 .ui_name span{font-size:21px;font-weight:bold;margin-left:18px;}
 .ui_menu{border-bottom: solid 1px #eeeeee;padding:0 0 0 3%;}