Fix missed merge conflict text in version.rb

neatchee · May 7, 2023 · 2a8b66a · 2a8b66a
1 parent 4bd3c80
commit 2a8b66a
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
@@ -21,15 +21,7 @@ def flags
     end
 
     def suffix
-<<<<<<< HEAD
       '+glitch'
-=======
-      '+cat'
-    end
-
-    def suffix_version
-      '+1.0.4'
->>>>>>> 9c4e0606d (Fix appearance/show.html.haml)
     end
 
     def to_a