git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-04 10:19:35 +06:30
parent 3ab3fa71a8 9dddd2fc78
commit e5e14aaa62
130 changed files with 2582 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@@ -9,14 +9,18 @@ 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
#Use PosgreSQL
gem 'pg'
# redis server for cable
gem 'redis', '~> 3.0'
# gem 'redis', '~> 3.0'
=======
gem 'pg'