fixed conflict

Gemfile

@@ -10,6 +10,7 @@ end
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
 #gem 'mysql2', '>= 0.3.18', '< 0.5'
+<<<<<<< HEAD
 
 #Use PosgreSQL
 gem 'pg'
@@ -17,6 +18,9 @@ gem 'pg'
 # redis server for cable
 gem 'redis', '~> 3.0'
 
+=======
+gem 'pg'
+>>>>>>> origami
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets