[fix] fix conflict

tookantech · Nov 25, 2023 · 797e49b · 797e49b
2 parents 3d581e7 + 18127b5
commit 797e49b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/EventServiceProvider.php b/src/EventServiceProvider.php
@@ -3,7 +3,6 @@
 namespace TookanTech\Chapaar;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
 use TookanTech\Chapaar\Events\SmsSent;
 use TookanTech\Chapaar\Events\StoreSmsMessage;
 

diff --git a/src/Events/SmsSent.php b/src/Events/SmsSent.php
@@ -20,4 +20,4 @@ public function __construct($provider, $data, $status)
         $this->data = $data;
         $this->status = $status;
     }
-}
+}
diff --git a/src/Listeners/StoreSmsMessage.php b/src/Listeners/StoreSmsMessage.php
@@ -2,10 +2,8 @@
 
 namespace TookanTech\Chapaar\Events;
 
-use TookanTech\Chapaar\Events\SmsSent;
-use TookanTech\Chapaar\Models\SmsMessage;
 use Illuminate\Contracts\Queue\ShouldQueue;
-
+use TookanTech\Chapaar\Models\SmsMessage;
 
 class StoreSmsMessage implements ShouldQueue
 {
@@ -17,4 +15,4 @@ public function handle(SmsSent $event)
         $smsMessage->status = $event->status;
         $smsMessage->save();
     }
-}
+}
diff --git a/src/Models/SmsMessage.php b/src/Models/SmsMessage.php
@@ -5,9 +5,8 @@
 use Illuminate\Database\Eloquent\Casts\AsCollection;
 use Illuminate\Database\Eloquent\Model;
 
-class SmsMessage extends Model 
+class SmsMessage extends Model
 {
-
     protected $fillable = [
         'provider',
         'data',
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ public function __construct($provider, $data, $status) @@
             $this->data = $data;
             $this->status = $status;
         }
-    }
+    }