Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
48823f77
Commit
48823f77
authored
Oct 14, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix gemfile.lock
parent
f913b566
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
Gemfile.lock
Gemfile.lock
+0
-9
No files found.
Gemfile.lock
View file @
48823f77
...
...
@@ -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/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment