This commit is contained in:
wuyingren 2020-07-16 12:28:55 +08:00
parent 40dd8aaed4
commit 3843d6fe55

View file

@ -13,11 +13,7 @@ module Mastodon
end
def patch
<<<<<<< HEAD
5
=======
0
>>>>>>> v3.2.0rc1
end
def flags