diff options
| author | gitlabhq <m@gitlabhq.com> | 2011-10-14 16:40:41 +0300 |
|---|---|---|
| committer | gitlabhq <m@gitlabhq.com> | 2011-10-14 16:40:41 +0300 |
| commit | 2cd52b492a65b60723473748912110b24f05b29c (patch) | |
| tree | 46e528914f477681d7e7a9818f0b364066a1b79f /Gemfile.lock | |
| parent | a18924e954e79f07778da65d5978823d63f98ecf (diff) | |
| parent | 0f6ebcb694830b763f193a521c038b3d501a7abd (diff) | |
| download | gitlab-ce-2cd52b492a65b60723473748912110b24f05b29c.tar.gz | |
install & update
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c02ad3cdc18..88d2a84f993 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,11 +22,20 @@ 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/ |