[F] Fix an abrupt merge error

2023-12-04 14:45:56 +08:00 · 2023-12-04 14:45:56 +08:00 · a62bfc0a03
parent b4a8137850
commit a62bfc0a03
1 changed files with 0 additions and 4 deletions
--- a/people/Hangmster/page.en.md
+++ b/people/Hangmster/page.en.md
@ -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