solved conflicts

blumilksoftware · Dec 2, 2024 · bc8387e · bc8387e
2 parents 637063d + 5b8c4de
commit bc8387e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@ yarn-error.log
 /.vscode
 /.zed
 .php-cs-fixer.cache
+
+
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -31,4 +31,4 @@ public function boot(): void
             },
         ]);
     }
-}
+}
diff --git a/resources/js/app.ts b/resources/js/app.ts
@@ -24,4 +24,4 @@ createInertiaApp({
   progress: {
     color: '#4B5563',
   },
-});
+});
diff --git a/routes/web.php b/routes/web.php
@@ -24,4 +24,4 @@
     Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
 });
 
-require __DIR__.'/auth.php';
+require __DIR__.'/auth.php';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ yarn-error.log
		/.vscode
		/.zed
		.php-cs-fixer.cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ public function boot(): void @@
                 },
             ]);
         }
-    }
+    }