chore: fix merge conflict

This commit is contained in:
PalmDevs 2024-12-27 02:05:53 +07:00
parent 49232479d1
commit e4541916b3
No known key found for this signature in database
GPG key ID: 6FAE8F8677ACA8BA

View file

@ -1,9 +1,5 @@
<<<<<<< HEAD
blank_issues_enabled: false
contact_links:
- name: 🗨 Discussions
url: https://discord.gg/ddcQf3s2Uq
about: Have something unspecific to Revenge in mind? Join us on Discord!
=======
blank_issues_enabled: false
>>>>>>> upstream/main