admin.php

route/admin.php

@@ -147,11 +147,8 @@ Route::get('useage/:useage_id','em/useage/detail');
 Route::get('useage_add/:id','em/useage/create');
 Route::post('useage_add','em/useage/store');
 Route::post('useage_del','em/useage/del');
-<<<<<<< HEAD
-Route::post('useage_update','em/useage/update');
-=======
+
 Route::get('useage_update/:useage_id','em/useage/update');
->>>>>>> 712dea449184407dd0ea2cb79857be09da1c93cd
 Route::post('upFile','em/UploadFile/upFile');