fixes conflicts

db/dev_seeds.rb

@@ -11,6 +11,7 @@ Setting.create(key: 'official_level_5_name', value: 'Alcaldesa')
 Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50')
 Setting.create(key: 'max_votes_for_proposal_edit', value: '1000')
 Setting.create(key: 'proposal_code_prefix', value: 'MAD')
+Setting.create(key: 'votes_for_proposal_success', value: '100')
 
 puts "Creating Users"
 

db/migrate/20150914114019_change_email_config_field_in_user.rb

@@ -0,0 +1,5 @@
+class ChangeEmailConfigFieldInUser < ActiveRecord::Migration
+  def change
+    rename_column :users, :email_on_debate_comment, :email_on_comment
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150914113251) do
+ActiveRecord::Schema.define(version: 20150914114019) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -260,7 +260,7 @@ ActiveRecord::Schema.define(version: 20150914113251) do
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.boolean  "email_on_debate_comment",             default: false
+    t.boolean  "email_on_comment",                    default: false
     t.boolean  "email_on_comment_reply",              default: false
     t.string   "phone_number",             limit: 30
     t.string   "official_position"

db/seeds.rb

@@ -20,3 +20,6 @@ Setting.create(key: 'max_votes_for_proposal_edit', value: '1000')
 
 # Prefix for the Proposal codes
 Setting.create(key: 'proposal_code_prefix', value: 'MAD')
+
+# Number of votes needed for proposal success
+Setting.create(key: 'votes_for_proposal_success', value: '53726')