storage-backups
/
one-among-us-data
mirror of https://github.com/one-among-us/data
1
0
Fork 0
Code Releases Activity

[F] Fix an abrupt merge error

pull/153/head
Amika 2023-12-04 14:45:56 +08:00
parent b4a8137850
commit a62bfc0a03
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
people/Hangmster/page.en.md
View File

@ -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. 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.
=======
Rest well, Hangmster. May you can be yourself as you like.
>>>>>>> a6410768c8bfa5ae03a29d482560d87d854f8255