.

laraxot · Sep 24, 2024 · 662e61d · 662e61d
1 parent 10f2f0f
commit 662e61d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/InstallerServiceProvider.php b/src/InstallerServiceProvider.php
@@ -2,7 +2,11 @@
 
 namespace Laraxot\Installer;
 
+<<<<<<< HEAD
 use Laraxot\Installer\Commands\InstallCommand;
+=======
+use Laraxot\Installer\Commands\InstallerCommand;
+>>>>>>> 64e260f (Fix styling)
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;