From 3843d6fe55fadbb4433b71e47663b84b170d6943 Mon Sep 17 00:00:00 2001
From: wuyingren <i@bgme.me>
Date: Thu, 16 Jul 2020 12:28:55 +0800
Subject: [PATCH] version

---
 lib/mastodon/version.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6ff79acf2..048a1a80f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,11 +13,7 @@ module Mastodon
     end
 
     def patch
-<<<<<<< HEAD
-      5
-=======
       0
->>>>>>> v3.2.0rc1
     end
 
     def flags