From 13d359ccbb10749054aeb7edd98ba37107dbab2d Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 8 Sep 2023 10:29:50 -0700
Subject: [PATCH] Add unsaved file

---
 .github/ISSUE_TEMPLATE/feature_request.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4e72436..0353e69 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,3 @@
-<<<<<<< Updated upstream
-<!--
-SPDX-FileCopyrightText: 2023 Melissa LeBlanc-Williams for Adafruit Industries
-SPDX-License-Identifier: MIT
--->
-=======
->>>>>>> Stashed changes
 ---
 name: 🚀 Feature Request
 about: Suggest an idea for this project
-- 
2.49.0