fixed conflict

2019-11-28 14:19:37 +06:30
parent b45c376ebc 2010b6a4bb
commit f035c2fe10
90 changed files with 3237 additions and 3284 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -374,5 +374,10 @@ DEPENDENCIES
  web-console (>= 3.3.0)
  whenever

+
+RUBY VERSION
+   ruby 2.4.1p111
+
+
 BUNDLED WITH
   2.0.2