syntax error

db/schema.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -12,65 +10,65 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 20_241_018_191_419) do
-  create_table 'instructors', force: :cascade do |t|
-    t.integer 'id_number'
-    t.string 'last_name'
-    t.string 'first_name'
-    t.string 'middle_name'
-    t.string 'email'
-    t.boolean 'before_9'
-    t.boolean 'after_3'
-    t.text 'beaware_of'
-    t.integer 'schedule_id'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.index ['schedule_id'], name: 'index_instructors_on_schedule_id'
+ActiveRecord::Schema[7.2].define(version: 2024_10_18_191419) do
+  create_table "instructors", force: :cascade do |t|
+    t.integer "id_number"
+    t.string "last_name"
+    t.string "first_name"
+    t.string "middle_name"
+    t.string "email"
+    t.boolean "before_9"
+    t.boolean "after_3"
+    t.text "beaware_of"
+    t.integer "schedule_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
   end
 
-  create_table 'rooms', force: :cascade do |t|
-    t.integer 'campus'
-    t.boolean 'is_lecture_hall'
-    t.boolean 'is_learning_studio'
-    t.boolean 'is_lab'
-    t.string 'building_code'
-    t.string 'room_number'
-    t.integer 'capacity'
-    t.boolean 'is_active'
-    t.string 'comments'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.integer 'schedule_id', default: -1, null: false
-    t.index ['schedule_id'], name: 'index_rooms_on_schedule_id'
+  create_table "rooms", force: :cascade do |t|
+    t.integer "campus"
+    t.boolean "is_lecture_hall"
+    t.boolean "is_learning_studio"
+    t.boolean "is_lab"
+    t.string "building_code"
+    t.string "room_number"
+    t.integer "capacity"
+    t.boolean "is_active"
+    t.string "comments"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "schedule_id", default: -1, null: false
+    t.index ["schedule_id"], name: "index_rooms_on_schedule_id"
   end
 
-  create_table 'schedules', force: :cascade do |t|
-    t.string 'schedule_name'
-    t.string 'semester_name'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "schedules", force: :cascade do |t|
+    t.string "schedule_name"
+    t.string "semester_name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table 'users', force: :cascade do |t|
-    t.string 'email'
-    t.string 'first_name'
-    t.string 'last_name'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.string 'uid'
-    t.string 'provider'
-    t.index ['email'], name: 'index_users_on_email', unique: true
+  create_table "time_slots", force: :cascade do |t|
+    t.string "day"
+    t.string "start_time"
+    t.string "end_time"
+    t.string "slot_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  add_foreign_key 'instructors', 'schedules'
-  add_foreign_key 'rooms', 'schedules'
-
-  create_table 'time_slots', force: :cascade do |t|
-    t.string 'day'
-    t.string 'start_time'
-    t.string 'end_time'
-    t.string 'slot_type'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "users", force: :cascade do |t|
+    t.string "email"
+    t.string "first_name"
+    t.string "last_name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "uid"
+    t.string "provider"
+    t.index ["email"], name: "index_users_on_email", unique: true
   end
+
+  add_foreign_key "instructors", "schedules"
+  add_foreign_key "rooms", "schedules"
 end

db/seeds.rb

@@ -62,9 +62,4 @@
                   { day: 'F', start_time: '13:50', end_time: '14:40', slot_type: 'LAB' },
                   { day: 'F', start_time: '15:00', end_time: '15:50', slot_type: 'LAB' }
 
-<<<<<<< HEAD
-])
-
-=======
                 ])
->>>>>>> 15e82e91959c9a7f56464c8ed57d02f89bf544eb