Merge remote-tracking branch 'origin/main'

# Conflicts: # src/QrCodeServiceProvider.php
dominik-eller · Sep 20, 2024 · 73fbacf · 73fbacf
2 parents d8872de + ff08efb
commit 73fbacf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/QrCodeServiceProvider.php b/src/QrCodeServiceProvider.php
@@ -5,7 +5,6 @@
 use Deller\QrCode\Factories\QrCodeFactory;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Deller\QrCode\Commands\QrCodeCommand;
 
 class QrCodeServiceProvider extends PackageServiceProvider
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,9 +2,9 @@
 
 namespace Deller\QrCode\Tests;
 
+use Deller\QrCode\QrCodeServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Deller\QrCode\QrCodeServiceProvider;
 
 class TestCase extends Orchestra
 {