Browse files

fix Gemfile lock - remove conflict markers

  • Loading branch information...
1 parent dd0e1c4 commit e7e74e1538d869ab8391ba5dd4a87dc452176ce2 Matt Van Horn committed May 14, 2012
Showing with 0 additions and 31 deletions.
  1. +0 −31 Gemfile.lock
View
31 Gemfile.lock
@@ -7,33 +7,6 @@ PATH
GEM
remote: http://rubygems.org/
specs:
-<<<<<<< HEAD
- activemodel (3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
- tzinfo (~> 0.3.29)
- activesupport (3.2.1)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- arel (3.0.2)
- builder (3.0.0)
- diff-lcs (1.1.2)
- i18n (0.6.0)
- multi_json (1.1.0)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- tzinfo (0.3.31)
-=======
activemodel (3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
@@ -63,15 +36,11 @@ GEM
diff-lcs (~> 1.1.3)
rspec-mocks (2.10.1)
tzinfo (0.3.33)
->>>>>>> added support for Appraisal and removed ginger, also added instance variable for visitor so nulldb works with AR 3.2
PLATFORMS
ruby
DEPENDENCIES
activerecord-nulldb-adapter!
-<<<<<<< HEAD
-=======
appraisal
->>>>>>> added support for Appraisal and removed ginger, also added instance variable for visitor so nulldb works with AR 3.2
rspec (>= 1.2.9)

0 comments on commit e7e74e1

Please sign in to comment.