Add unsaved file

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4e72436b7ceac1ab3b9f563691c1421fef503ab8..0353e69e4fdf6b06d57123028656a2637b7f77a2 100644 (file)
--- 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