Gemfile.orig in rubyneat-0.4.0.alpha.4 vs Gemfile.orig in rubyneat-0.4.0.alpha.5
- old
+ new
@@ -31,15 +31,15 @@
gem 'yard', '~> 0'
gem 'guard', '~> 2'
gem 'guard-rspec', '~> 4'
gem 'semver', '~> 1'
<<<<<<< HEAD
- gem "jeweler", "~> 2"
+ gem "juwelier", "~> 2"
gem "simplecov", '~> 0'
#gem 'debugger'
#gem 'ruby-debug-ide', '~> 1'
=======
- gem 'jeweler', '~> 2'
+ gem 'juwelier', '~> 2'
gem 'simplecov', '~> 0'
>>>>>>> devready
end
#======================================================
\ No newline at end of file