From 95d72acafdfeef5d0977c93f84ff4b276c778c93 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 4 Jun 2022 20:02:06 -0400
Subject: [PATCH] powder that makes you say yes

---
 .github/ISSUE_TEMPLATE/bug_report.md | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c5a7af856e..73e550111f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,20 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-<<<<<<< HEAD
-
----
-
-#### Brief description of the issue
-
-
-#### What you expected to happen
-
-
-#### What actually happened
-
-
-=======
 title: ''
 labels: 'Type: Bug'
 assignees: ''
@@ -35,22 +21,15 @@ assignees: ''
 #### What actually happened
 
 <!-- Same here, please include any context that might have contributed, such as actions taken right before.-->
->>>>>>> b5b5a45a2e... Merge pull request #13027 from ItsSelis/master
 #### Steps to reproduce
 - (Step 1)
 - (Step 2)
 - (and so on)
 
-<<<<<<< HEAD
-#### Code Revision
-- (Found using the "Show Server Revision" verb under the OOC tab.)
- 
-=======
 <!--Optional, you may remove this section.-->
 #### Code Revision
 - (Found using the "Show Server Revision" verb under the OOC tab.)
  
 <!--Optional, you may remove this section.-->
->>>>>>> b5b5a45a2e... Merge pull request #13027 from ItsSelis/master
 #### Anything else you may wish to add:
 - (Location if it's a mapping issue, screenshots, sprites, etc.)