Fixed merge conflicts

db/migrate/20140716001857_add_confirmation_token_to_conference_registrations.rb

@@ -0,0 +1,5 @@
+class AddConfirmationTokenToConferenceRegistrations < ActiveRecord::Migration
+  def change
+    add_column :conference_registrations, :confirmation_token, :string
+  end
+end

db/migrate/20140716002152_add_data_to_conference_registrations.rb

@@ -0,0 +1,5 @@
+class AddDataToConferenceRegistrations < ActiveRecord::Migration
+  def change
+    add_column :conference_registrations, :data, :binary
+  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: 20140714013645) do
+ActiveRecord::Schema.define(version: 20140716002152) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -64,6 +64,8 @@ ActiveRecord::Schema.define(version: 20140714013645) do
     t.boolean  "is_confirmed"
     t.boolean  "is_participant"
     t.boolean  "is_volunteer"
+    t.string   "confirmation_token"
+    t.binary   "data"
   end
 
   create_table "conference_types", force: true do |t|