mirror of
https://github.com/one-among-us/data.git
synced 2024-11-10 13:24:50 +08:00
[F] Fix an abrupt merge error
This commit is contained in:
parent
b4a8137850
commit
a62bfc0a03
@ -17,8 +17,4 @@ Hangmster was often troubled by insomnia and anxiety. They once said that they a
|
||||
|
||||
Unfortunately, although they always encouraged us to live bravely, they still chose to leave at the beginning of the year.
|
||||
|
||||
<<<<<<< HEAD
|
||||
Rest well, Hangmster. May you can be yourself.
|
||||
=======
|
||||
Rest well, Hangmster. May you can be yourself as you like.
|
||||
>>>>>>> a6410768c8bfa5ae03a29d482560d87d854f8255
|
||||
|
Loading…
Reference in New Issue
Block a user