fixed merge in gemfile

2011-04-27 23:23:14 -04:00 · 2011-04-27 23:23:14 -04:00 · f4f9d7bfdc
commit f4f9d7bfdc
parent 27809a19de
1 changed files with 0 additions and 6 deletions
--- a/6
+++ b/6
@ -21,11 +21,5 @@ gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/
 gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
 gem 'mocha'
 gem 'timecop'
-<<<<<<< HEAD
 gem 'diff-lcs', '~> 1.1.2'

-
-
-
-=======
->>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd