no message

routes/web.php

@@ -40,6 +40,22 @@ Route::get('profiles', function(){
 Route::group(['middleware' => 'auth'], function () {
 });
 
+<<<<<<< HEAD
+=======
+
+
+Route::get('EditRoom', function(){
+
+Route::get('adminlte', function(){
+	return view('welcome');
+});
+
+
+Route::get('EditRoom', function(){
+
+	return view('adminlte::layouts.owner.EditRoom');
+});
+>>>>>>> f4c075b010d2b76c6543df092b6fd1beaeba6a8e
 Route::get('AddBook', function(){
 	return view('adminlte::layouts.owner.AddBookManual');
 });