From 5713eee538c0f31812d5b336c4ef329f68bea665 Mon Sep 17 00:00:00 2001
From: MRBadri <badri0000badri@gmail.com>
Date: Mon, 25 Mar 2024 12:06:17 +0330
Subject: [PATCH] fix: conflic in issue template

---
 .github/ISSUE_TEMPLATE/feature_request.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index d197d42..c474906 100644
--- 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