fixing Gemfile

2013-09-06 10:08:53 -04:00
parent 1f3620a3de
commit 0bb5fd06c1
2 changed files with 8 additions and 12 deletions
@@ -55,13 +55,11 @@ gem 'jquery-rails'

 # Pow related gem
 gem 'powder'
-<<<<<<< HEAD

 gem 'aruba'
 gem 'minitest', '~> 4.0', :require=> "minitest/autorun"
-=======
+
 #gem 'minitest'
->>>>>>> adding rspec and auto test runs

 # Deploy with Capistrano
 # gem 'capistrano'