1

application/admin/controller/Report.php

@@ -269,11 +269,7 @@ class Report extends Base
             'times_inline' => $times_inline_array
         );
     }
-
-<<<<<<< HEAD
-=======
-
->>>>>>> 485c080af6c3f51a2504227cde48148b3e60876e
+    
     // 工作报表
     public function workreport()
     {
@@ -378,9 +374,4 @@ class Report extends Base
 
         return $this->fetch();
     }
-<<<<<<< HEAD
-
-=======
->>>>>>> 485c080af6c3f51a2504227cde48148b3e60876e
-
 }//end class