fixing merge conflicts

GreenGogh47 · GreenGogh47 · commit 91b78acde85d · 2025-10-03T09:16:02.000-06:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -842,4 +842,4 @@ DEPENDENCIES
   webmock (~> 3.25)
 
 BUNDLED WITH
-   2.7.2
+   2.7.1
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_08_26_223940) do
+ActiveRecord::Schema[8.0].define(version: 2025_09_13_173217) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#`
`11`	`11`	`# It's strongly recommended that you check this file into your version control system.`
`12`	`12`
`13`		`-ActiveRecord::Schema[8.0].define(version: 2025_08_26_223940) do`
	`13`	`+ActiveRecord::Schema[8.0].define(version: 2025_09_13_173217) do`
`14`	`14`	`# These are extensions that must be enabled in order to support this database`
`15`	`15`	`enable_extension "pg_catalog.plpgsql"`
`16`	`16`