From a6ec91e43a2ca77f66fd430f45b3af7320b59466 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 23 Dec 2022 14:23:21 +0000 Subject: [PATCH] feat: more conflict resolution --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 56d5d7a41..c3fc7d946 100644 --- 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[7.0].define(version: 2022_12_23_115948) do +ActiveRecord::Schema[7.0].define(version: 2022_12_22_153059) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql"