fixed conflict

2017-06-07 17:15:51 +06:30
parent d2ce74f648 4323da6589
commit bd345dbc3f
33 changed files with 291 additions and 139 deletions
--- a/2
+++ b/2
@@ -13,8 +13,8 @@ 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'