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 14:50:50 +06:30
parent 89cbb59e7c
commit 46f9bef246
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@@ -9,19 +9,17 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0' gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record # Use mysql as the database for Active Record
<<<<<<< HEAD
#gem 'mysql2', '>= 0.3.18', '< 0.5' #gem 'mysql2', '>= 0.3.18', '< 0.5'
gem 'pg' gem 'pg'
=======
gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL #Use PosgreSQL
gem 'pg'
# redis server for cable # redis server for cable
# gem 'redis', '~> 3.0' # gem 'redis', '~> 3.0'
>>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 3.0' gem 'puma', '~> 3.0'
# Use SCSS for stylesheets # Use SCSS for stylesheets