Fix conflict with master

shenril · Aug 19, 2019 · 37b83ed · 37b83ed
1 parent dfaf58d
commit 37b83ed
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,15 +7,7 @@ assignees: shenril
 
 ---
 
-<<<<<<< HEAD
-**Environment :**
-
-- OS: [e.g. Windows,Linux,Mac]
-- Python version [e.g. 3.5, 3.6]
-- Sitadel version
-=======
 ## Environment
->>>>>>> master
 
 - OS: [e.g. Windows,Linux,Mac]
 - Python version [e.g. 3.5, 3.6]