fixed conflict

2017-06-07 22:29:43 +06:30
parent fd1c53432c f9c8dbc03e
commit 44382d284f
52 changed files with 746 additions and 249 deletions
--- a/5
+++ b/5
@@ -10,10 +10,13 @@ end
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record

-gem 'mysql2', '>= 0.3.18', '< 0.5'
+#gem 'mysql2', '>= 0.3.18', '< 0.5'

 #Use PosgreSQL

+gem 'pg'
+
+
 # redis server for cable
 # gem 'redis', '~> 3.0'