rebase

laraxot · Sep 4, 2023 · 53bba6a · 53bba6a
1 parent 97fd3c1
commit 53bba6a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/Models/BaseModel.php b/Models/BaseModel.php
@@ -16,8 +16,25 @@
  */
 abstract class BaseModel extends Model
 {
+<<<<<<< HEAD
     // use Searchable;
     // //use Cachable;
+=======
+    use Updater;
+/**
+ * Indicates whether attributes are snake cased on arrays.
+ *
+ * @see  https://laravel-news.com/6-eloquent-secrets
+* 
+ * @var bool
+ */
+// public static $snakeAttributes = true;
+
+protected $perPage = 30;
+
+    //use Searchable;
+    //use Cachable;
+>>>>>>> 9a6fed4 (up)
     use HasFactory;
 
     use Updater;

diff --git a/Models/BaseModelLang.old b/Models/BaseModelLang.old
@@ -16,7 +16,26 @@ use Modules\Xot\Traits\Updater;
  *
  * @property string|null $post_type
  */
+<<<<<<< HEAD:Models/BaseModelLang.old
 abstract class BaseModelLang extends Model {
+=======
+abstract class BaseModelLang extends Model
+{
+    use Updater;
+/**
+ * Indicates whether attributes are snake cased on arrays.
+ *
+ * @see  https://laravel-news.com/6-eloquent-secrets
+* 
+ * @var bool
+ */
+// public static $snakeAttributes = true;
+
+protected $perPage = 30;
+
+    //use Searchable;
+    use LinkedTrait;
+>>>>>>> 9a6fed4 (up):Models/BaseModelLang.php
     use HasFactory;
 
     // use Searchable;

diff --git a/Models/BaseMorphPivot.php b/Models/BaseMorphPivot.php
@@ -13,6 +13,7 @@
 abstract class BaseMorphPivot extends MorphPivot
 {
     use Updater;
+<<<<<<< HEAD
     /**
      * Indicates whether attributes are snake cased on arrays.
      *
@@ -33,6 +34,19 @@ abstract class BaseMorphPivot extends MorphPivot
     public $timestamps = true;
 
     protected $perPage = 30;
+=======
+/**
+ * Indicates whether attributes are snake cased on arrays.
+ *
+ * @see  https://laravel-news.com/6-eloquent-secrets
+* 
+ * @var bool
+ */
+// public static $snakeAttributes = true;
+
+protected $perPage = 30;
+
+>>>>>>> 9a6fed4 (up)
 
     protected $connection = 'notify';
 

diff --git a/Models/BasePivot.php b/Models/BasePivot.php
@@ -14,6 +14,7 @@
 abstract class BasePivot extends Pivot
 {
     use Updater;
+<<<<<<< HEAD
     /**
      * Indicates whether attributes are snake cased on arrays.
      *
@@ -22,6 +23,20 @@ abstract class BasePivot extends Pivot
      * @var bool
      */
     public static $snakeAttributes = true;
+=======
+/**
+ * Indicates whether attributes are snake cased on arrays.
+ *
+ * @see  https://laravel-news.com/6-eloquent-secrets
+* 
+ * @var bool
+ */
+// public static $snakeAttributes = true;
+
+protected $perPage = 30;
+
+    //use Searchable;
+>>>>>>> 9a6fed4 (up)
 
     /**
      * @var bool