fixed conflict

2019-11-08 16:08:45 +06:30
parent b73136dc79 8f0fe2909d
commit 9b798dc699
19 changed files with 585 additions and 955 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -375,5 +375,8 @@ DEPENDENCIES
  web-console (>= 3.3.0)
  whenever

+
+RUBY VERSION
+   ruby 2.4.1p111
 BUNDLED WITH
   2.0.2