no message

routes/web.php

@@ -47,18 +47,18 @@ Route::group(['middleware' => 'auth'], function () {
 });
 
 
-<<<<<<< HEAD
-/*Route::get('EditRoom', function(){
-=======
+
+Route::get('EditRoom', function(){
+
 Route::get('adminlte', function(){
 	return view('welcome');
 });
 
 
 Route::get('EditRoom', function(){
->>>>>>> e284fbd4e32a23911ebcd8b9659904834dc7b2f9
+
 	return view('adminlte::layouts.owner.EditRoom');
-});*/
+});
 Route::get('AddBook', function(){
 	return view('adminlte::layouts.owner.AddBookManual');
 });