update gem

2017-06-08 19:07:20 +06:30
parent c11b4b7fe0
commit 42a29296c7
1 changed files with 1 additions and 4 deletions
--- a/5
+++ b/5
@@ -57,11 +57,8 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'

 # Pagination
-<<<<<<< HEAD
-gem 'kaminari', '~> 0.16.3' #:git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
-=======
 gem 'kaminari', '~> 0.16.3'
->>>>>>> ea4f50e77942a7ccaa988af4dedd8cb4665b59c7
+

 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development