deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix gemfile.lock

Browse source
This commit is contained in:
gitlabhq 2011-10-14 16:41:35 +03:00
parent 2cd52b492a
commit 88f1f5bba6
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Gemfile.lock
View file

@ -22,20 +22,11 @@ GIT
GIT GIT
remote: git://github.com/mbleigh/seed-fu.git remote: git://github.com/mbleigh/seed-fu.git
<<<<<<< HEAD
revision: 77be06852b18fb01e272ab763ddb292da575586c revision: 77be06852b18fb01e272ab763ddb292da575586c
specs: specs:
seed-fu (2.1.0) seed-fu (2.1.0)
activerecord (~> 3.1.0) activerecord (~> 3.1.0)
activesupport (~> 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 GEM
remote: http://rubygems.org/ remote: http://rubygems.org/