fix with merge

2017-06-23 19:20:00 +06:30
parent e01ecc6e0f
commit 1f6a0eb1f6
3 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'

 #Use PosgreSQL
-gem 'pg'
+#gem 'pg'

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