up

laraxot · Aug 6, 2024 · a33eeba · a33eeba
1 parent d083460
commit a33eeba
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/Models/Notification.php b/Models/Notification.php
@@ -99,24 +99,6 @@
  * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
  * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
  * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
-<<<<<<< HEAD
-=======
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
-<<<<<<< HEAD
->>>>>>> cfb982e (up)
-=======
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> all($columns = ['*'])
- * @method static DatabaseNotificationCollection<int, static> get($columns = ['*'])
->>>>>>> e290700 (up)
  * @mixin \Eloquent
  */
 class Notification extends DatabaseNotification