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

fix conflict Gemfile.lock

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-09-30 09:41:48 +06:30
parent 3c56025f76
commit e72eaf9c0e
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile.lock
View File

@@ -157,15 +157,6 @@ GEM
minitest (5.12.0) minitest (5.12.0)
momentjs-rails (2.20.1) momentjs-rails (2.20.1)
railties (>= 3.1) railties (>= 3.1)
monetize (1.9.2)
money (~> 6.12)
money (6.13.4)
i18n (>= 0.6.4, <= 2)
money-rails (1.13.2)
activesupport (>= 3.0)
monetize (~> 1.9.0)
money (~> 6.13.2)
railties (>= 3.0)
multi_xml (0.6.0) multi_xml (0.6.0)
mysql2 (0.5.2) mysql2 (0.5.2)
nested_form (0.3.2) nested_form (0.3.2)
@@ -349,12 +340,7 @@ DEPENDENCIES
material_icons material_icons
mini_magick mini_magick
momentjs-rails momentjs-rails
<<<<<<< HEAD
mysql2 mysql2
=======
money-rails (~> 1.12)
mysql2 (>= 0.3.18, < 0.5)
>>>>>>> ec9e4fb7ebe54e215a0bb8ac6c58b49fa9e20712
nested_form nested_form
pdfjs_viewer-rails pdfjs_viewer-rails
pg pg