fixes conflicts with fork

2016-06-17 19:40:30 +02:00
parent 9f195350a3
commit 98040e191e
8 changed files with 29 additions and 2 deletions
--- a/db/migrate/20160617172616_add_badge_to_users.rb
+++ b/db/migrate/20160617172616_add_badge_to_users.rb
@@ -0,0 +1,5 @@
+class AddBadgeToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :official_position_badge, :boolean, default: false
+  end
+end