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/2
+++ b/2
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-
+ruby '2.4.1'
 git_source(:github) do |repo_name|
  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
  "https://github.com/#{repo_name}.git"