mirror of
https://github.com/yingziwu/mastodon.git
synced 2026-02-04 03:25:14 +00:00
fix version.rb
This commit is contained in:
parent
3bec1c88b4
commit
7cae14482d
1 changed files with 1 additions and 5 deletions
|
|
@ -33,11 +33,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
def repository
|
||||
<<<<<<< HEAD
|
||||
ENV.fetch('GITHUB_REPOSITORY') { 'yingziwu/mastodon' }
|
||||
=======
|
||||
ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
|
||||
>>>>>>> upstream/main
|
||||
ENV.fetch('GITHUB_REPOSITORY', 'yingziwu/mastodon')
|
||||
end
|
||||
|
||||
def source_base_url
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue