更新 admin.php

route/admin.php

@@ -147,10 +147,7 @@ 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
-=======
 
->>>>>>> test
 Route::get('useage_update/:useage_id','em/useage/update');
 Route::post('upFile','em/UploadFile/upFile');