Merged more conflicts

db/schema.rb

@@ -10,11 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(:version => 20120825041626) do
-=======
 ActiveRecord::Schema.define(:version => 20120904024426) do
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
   create_table "door_logs", :force => true do |t|
     t.string   "key"
@@ -28,12 +24,6 @@ ActiveRecord::Schema.define(:version => 20120904024426) do
     t.integer  "card_id"
     t.string   "card_number"
     t.integer  "card_permissions"
-<<<<<<< HEAD
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-=======
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.string   "email",                  :default => "", :null => false
@@ -52,5 +42,4 @@ ActiveRecord::Schema.define(:version => 20120904024426) do
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
 
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 end