fix: conflic in issue template

mrbadri · Mar 25, 2024 · 5713eee · 5713eee
1 parent 0d4a7c4
commit 5713eee
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,15 +1,12 @@
 name: Feature request
-<<<<<<< HEAD
 title: '[Feat] YOUR_FEATURE_TITLE_HERE_REPLACE_ME'
-labels: [feature request]
+labels: [feat]
 description: |
   💡 Suggest an idea for the `mui-builder` project
-=======
-title: '[Feature Request] YOUR_FEATURE_TITLE_HERE_REPLACE_ME'
 labels: [feature request]
 description: |
-  💡 Suggest an idea for the `NextUI` project
->>>>>>> 64f89a26b25eae6085d73f17170e125dce20c79e
+  💡 Suggest an idea for the `Mui Builder` project
+
   Examples
     - propose a new component
     - improve an exiting component