From 7cae14482dec0f3fe477b96efb049db1584cf87c Mon Sep 17 00:00:00 2001
From: bgme <i@bgme.me>
Date: Thu, 2 Sep 2021 00:21:38 +0800
Subject: [PATCH] fix version.rb

---
 lib/mastodon/version.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 4c670a8cd..96af2e733 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -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