From b981b3f942c8d12bf6b25ebe237f52b657f1e95b Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 25 Nov 2021 00:43:22 +0100
Subject: [PATCH] fix: [conflict] resolved in user_org update script

---
 config/Migrations/20211123152707_user_org.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/config/Migrations/20211123152707_user_org.php b/config/Migrations/20211123152707_user_org.php
index d51fd1e..47d8a5b 100644
--- a/config/Migrations/20211123152707_user_org.php
+++ b/config/Migrations/20211123152707_user_org.php
@@ -18,7 +18,6 @@ final class UserOrg extends AbstractMigration
      */
     public function change(): void
     {
-<<<<<<< HEAD
         $exists = $this->table('users')->hasColumn('organisation_id');
         if (!$exists) {
             $this->table('users')
@@ -31,17 +30,6 @@ final class UserOrg extends AbstractMigration
                 ->addIndex('organisation_id')
                 ->update();
         }
-=======
-        $alignments = $this->table('users')
-            ->addColumn('organisation_id', 'integer', [
-                'default' => null,
-                'null' => true,
-                'signed' => false,
-                'length' => 10
-            ])
-            ->addIndex('organisation_id')
-            ->update();
->>>>>>> main
         $q1 = $this->getQueryBuilder();
         $org_id = $q1->select(['min(id)'])->from('organisations')->execute()->fetchAll()[0][0];
         if (!empty($org_id)) {