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/1
+++ b/1
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'

-
 ruby '2.4.1'
 #ruby '2.5.7'