bug

HappyWork/HappyWork/Class/DemandHall/ViewController/DemanHallViewController.m

@@ -62,11 +62,8 @@ PageListTableViewDelegate
 }
 - (void)test{
     
-    ///<<<<< HEAD
     NSLog(@"主干bug修改了");
-//=======
-//    NSLog(@"分支测试");
-//>>>>>>> ControlChanges
+
 }
 #pragma mark - event response 通知
 /* 登录刷新 */