i think this was a merge conflict

Bram-Hub · Apr 7, 2023 · 354a863 · 354a863
1 parent 9f461f9
commit 354a863
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,11 +1,7 @@
 name: Feature request
 description: Suggest an idea for this project
 title: "[FEATURE] <description>"
-  <<<<<<< HEAD
-labels: [ new feature ]
-  =======
 labels: [ enhancement, new feature ]
-  >>>>>>> b28ba6c38166142ecd457ffee2797fffc89a51b4
 body:
   - type: textarea
     id: description