Permalink
Browse files

Fix diff line in Gemfile.

  • Loading branch information...
1 parent d1d615d commit 0d6cafcec30361e8d402a3144667ed8387911003 @parndt parndt committed Oct 22, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 Gemfile
View
@@ -21,7 +21,7 @@ group :development, :test do
gem 'mysql2'
gem 'pg'
end
->>>>>>> Add proper dependency to refinerycms-core 2.1.0 and refinerycms-acts-as-indexed 1.0.0
+end
# Database Configuration
unless ENV['TRAVIS']

0 comments on commit 0d6cafc

Please sign in to comment.