From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 8 Sep 2023 17:29:50 +0000 (-0700)
Subject: Add unsaved file
X-Git-Tag: 8.22.1~1^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/13d359ccbb10749054aeb7edd98ba37107dbab2d

Add unsaved file
---

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