fixed conflict · b45c376ebc - sx-fc - Gitea: Git with a cup of tea

git_admin/sx-fc

fixed conflict

This commit is contained in:

Nweni

2019-11-20 09:45:55 +06:30

parent 336e32f1a6 0ed10a0c64

commit b45c376ebc

1 changed files with 3 additions and 2 deletions

									
										3

Gemfile
									
												View File
												
					@@ -1,6 +1,7 @@

					source 'https://rubygems.org'

					source 'https://rubygems.org'

					# ruby '2.4.1'

					ruby '2.4.1'

					#ruby '2.5.7'

					#ruby '2.5.7'

					git_source(:github) do |repo_name|

					git_source(:github) do |repo_name|