github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge in gemfile

Browse Source
This commit is contained in:
Scott Davis 2011-04-27 23:23:14 -04:00
parent 27809a19de
commit f4f9d7bfdc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@ -21,11 +21,5 @@ gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/
gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
gem 'mocha' gem 'mocha'
gem 'timecop' gem 'timecop'
<<<<<<< HEAD
gem 'diff-lcs', '~> 1.1.2' gem 'diff-lcs', '~> 1.1.2'
=======
>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd