fixed conflict

2017-06-04 14:51:31 +06:30
parent 46f9bef246 aa295c3a12
commit b1691eb9f8
39 changed files with 328 additions and 83 deletions
--- a/8
+++ b/8
@@ -10,16 +10,24 @@ end
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record

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

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

+gem 'pg'
+
+
+
 #Use PosgreSQL


 # redis server for cable
 # gem 'redis', '~> 3.0'
+
+
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets