Merged more conflicts

2012-09-15 17:44:30 -07:00
parent d3b8ad7222
commit 0bc5858101
15 changed files with 1 additions and 115 deletions
--- a/3
+++ b/3
@@ -23,13 +23,10 @@ end

 gem 'jquery-rails'

-<<<<<<< HEAD
-=======
 gem 'devise'

 gem "cancan"

->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'