rebase

Database/Migrations/2022_10_12_133532_create_contacts_table.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Schema\Blueprint;
+use Modules\Xot\Database\Migrations\XotBaseMigration;
+
+class CreateContactsTable extends XotBaseMigration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up() {
+        // -- CREATE --
+        $this->tableCreate(
+            function (Blueprint $table) {
+                $table->uuid('id')->primary();
+                $table->morphs('model');
+                $table->string('contact_type')->nullable();
+                $table->string('value')->nullable();
+                $table->timestamp('verified_at')->nullable();
+                $table->timestamps();
+                $table->string('updated_by')->nullable()->after('updated_at');
+                $table->string('created_by')->nullable()->after('created_at');
+            }
+        );
+    }
+}

Models/Contact.php

@@ -4,6 +4,7 @@
 
 namespace Modules\Notify\Models;
 
+<<<<<<< HEAD
 /**
  * Modules\Notify\Models\Contact.
  *
@@ -123,4 +124,8 @@ class Contact extends BaseModel
         'model_id' => 'string',
         'user_id' => 'string',
     ];
+=======
+class Contact extends BaseModel {
+    protected $fillable = ['model_id', 'model_type', 'contact_type', 'value', 'verified_at', 'updated_at', 'created_at', 'updated_by', 'created_by'];
+>>>>>>> bd28543 (up)
 }