fixed conflict

2019-11-15 14:11:39 +06:30
parent 99b3606c2d b1ff773ac7
commit cc8cf0a48c
22 changed files with 579 additions and 341 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -377,6 +377,5 @@ DEPENDENCIES

 RUBY VERSION
   ruby 2.6.3p62
-
 BUNDLED WITH
   2.0.2