Download as
Browse Code »

Commit 88f1f5bba637b11673ce7a5a5b5361ceab821e0c

Authored by gitlabhq
1 parent 2cd52b49
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix gemfile.lock

Showing 1 changed file with 0 additions and 9 deletions   Show diff stats
@@ -22,20 +22,11 @@ GIT @@ -22,20 +22,11 @@ GIT
22 22
23 GIT 23 GIT
24 remote: git://github.com/mbleigh/seed-fu.git 24 remote: git://github.com/mbleigh/seed-fu.git
25 -<<<<<<< HEAD  
26 revision: 77be06852b18fb01e272ab763ddb292da575586c 25 revision: 77be06852b18fb01e272ab763ddb292da575586c
27 specs: 26 specs:
28 seed-fu (2.1.0) 27 seed-fu (2.1.0)
29 activerecord (~> 3.1.0) 28 activerecord (~> 3.1.0)
30 activesupport (~> 3.1.0) 29 activesupport (~> 3.1.0)
31 -=======  
32 - revision: 29fe8c61ca6cc4408115ea7475fe2647081bd348  
33 - branch: rails-3-1  
34 - specs:  
35 - seed-fu (2.0.1.rails31)  
36 - activerecord (~> 3.1.0.rc4)  
37 - activesupport (~> 3.1.0.rc4)  
38 ->>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473  
39 30
40 GEM 31 GEM
41 remote: http://rubygems.org/ 32 remote: http://rubygems.org/