fix gemfile.lock

gitlabhq
1 parent 2cd52b49
Showing 1 changed file with 0 additions and 9 deletions Show diff stats
Gemfile.lock
@@ -22,20 +22,11 @@ GIT
  
 GIT
   remote: git://github.com/mbleigh/seed-fu.git
-<<<<<<< HEAD
   revision: 77be06852b18fb01e272ab763ddb292da575586c
   specs:
     seed-fu (2.1.0)
       activerecord (~> 3.1.0)
       activesupport (~> 3.1.0)
-=======
-  revision: 29fe8c61ca6cc4408115ea7475fe2647081bd348
-  branch: rails-3-1
-  specs:
-    seed-fu (2.0.1.rails31)
-      activerecord (~> 3.1.0.rc4)
-      activesupport (~> 3.1.0.rc4)
->>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
  
 GEM
   remote: http://rubygems.org/
...	...	@@ -22,20 +22,11 @@ GIT
22	22
23	23	GIT
24	24	remote: git://github.com/mbleigh/seed-fu.git
25		-<<<<<<< HEAD
26	25	revision: 77be06852b18fb01e272ab763ddb292da575586c
27	26	specs:
28	27	seed-fu (2.1.0)
29	28	activerecord (~> 3.1.0)
30	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	31	GEM
41	32	remote: http://rubygems.org/
...	...