Update schema.rb

db/schema.rb

@@ -10,11 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< CLDC-3623-Support-user-bulk-uploading
-ActiveRecord::Schema[7.0].define(version: 2024_09_05_092332) do
-=======
 ActiveRecord::Schema[7.0].define(version: 2024_09_11_152702) do
->>>>>>> main
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -46,11 +42,8 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_11_152702) do
     t.text "choice"
     t.integer "total_logs_count"
     t.string "rent_type_fix_status", default: "not_applied"
-<<<<<<< CLDC-3623-Support-user-bulk-uploading
     t.integer "organisation_id"
-=======
     t.integer "moved_user_id"
->>>>>>> main
     t.index ["identifier"], name: "index_bulk_uploads_on_identifier", unique: true
     t.index ["user_id"], name: "index_bulk_uploads_on_user_id"
   end