chore: fix merge conflict
This commit is contained in:
parent
49232479d1
commit
e4541916b3
1 changed files with 0 additions and 4 deletions
4
.github/ISSUE_TEMPLATE/config.yml
vendored
4
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue