fixing conflicts [#7]

2015-07-18 17:40:38 +02:00
parent b7086bad4a 370924a377
commit fce0068bf4
19 changed files with 191 additions and 10 deletions
--- a/db/migrate/20150717164054_add_first_name_and_last_name_to_users.rb
+++ b/db/migrate/20150717164054_add_first_name_and_last_name_to_users.rb
@@ -0,0 +1,6 @@
+class AddFirstNameAndLastNameToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+  end
+end