fixed conflcit

Gemfile

@@ -9,8 +9,19 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
+<<<<<<< HEAD
 #gem 'mysql2', '>= 0.3.18', '< 0.5'
 gem 'pg'
+=======
+gem 'mysql2', '>= 0.3.18', '< 0.5'
+
+#Use PosgreSQL
+gem 'pg'
+
+# redis server for cable
+# gem 'redis', '~> 3.0'
+
+>>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
@@ -37,6 +48,8 @@ gem 'to_xls-rails'
 #Reporting gem
 #gem 'compendium'
 
+# Pagination
+gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'