fixed conflict

Gemfile

@@ -9,12 +9,12 @@ 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'
-<<<<<<< HEAD
-=======
+
 gem 'mysql2', '>= 0.3.18', '< 0.5'
->>>>>>> 9dddd2fc787b1fa43898427a96cd0bfea4fbd9e0
+
+gem 'pg'
+
+
 
 #Use PosgreSQL
 gem 'pg'
@@ -22,9 +22,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