X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka.git/blobdiff_plain/d6f5ceb74f5b659f7e5518eb0e9d1d26e90410de..HEAD:/.github/ISSUE_TEMPLATE/feature_request.md?ds=sidebyside

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