Merge and delete Devlop Frontend #32

hendrowunga · Nov 18, 2024 · 60d84ef · 60d84ef
1 parent 93ce9d3
commit 60d84ef
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -32,11 +32,9 @@
     Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
 });
 require __DIR__ . '/auth.php';
-<<<<<<< HEAD
+
 
 // Admin
 Route::view('/example-page', 'example-page');
 Route::view('/example-auth', 'example-auth');
 Route::view('example-frontend', 'example-frontend');
-=======
->>>>>>> 0ea23e764e60a2386bfa2e13af4ddfb539d4bcca