fixed merge

This commit is contained in:
Brandon Mathis 2011-04-26 23:02:59 -05:00
commit f3ea546150

View File

@ -12,12 +12,12 @@ gem "haml", "~> 3.1"
gem "rcov" gem "rcov"
gem "rubyzip" gem "rubyzip"
gem "livereload" gem "livereload"
gem "rb-fsevent" gem "rb-fsevent" if RUBY_PLATFORM =~ /darwin/
gem "ruby-prof" unless RUBY_PLATFORM == "java" gem "ruby-prof" unless RUBY_PLATFORM == "java"
gem 'autotest' gem 'autotest'
gem 'autotest-fsevent' 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'