Fix schema.rb merge

62284f06 · Luke Bennett · e16e82b5 · 62284f06
Commit 62284f06 authored Aug 01, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

db/schema.rb db/schema.rb +2 -2

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -208,8 +208,8 @@ ActiveRecord::Schema.define(version: 20180726172057) do
    t.boolean "enforce_terms", default: false
    t.boolean "pseudonymizer_enabled", default: false, null: false
    t.boolean "hide_third_party_offers", default: false, null: false
-    t.integer "custom_project_templates_group_id",
-    t.boolean "instance_statistics_visibility_private", default: false, null: false
+    t.boolean "instance_statistics_visibility_private", default: false, null: false,
+    t.integer "custom_project_templates_group_id"
  end

  create_table "approvals", force: :cascade do |t|