Merge pull request #1176 from magento/format-fix-techbulletin

Format fix for 2.0 Technical Bulletin

Author: jfrontain

guides/v2.0/release-notes/tech_bull_21-upgrade.md

@@ -10,11 +10,8 @@ version: 2.1
 github_link: release-notes/tech_bull_21-upgrade.md
 ---
 
-<<<<<<< HEAD
+
 These instructions apply to anyone upgrading to Magento Open Source (formerly Community Edition) or Magento Commerce (formerly Enterprise Edition)  version 2.1 (including a Release Candidate). 
-=======
-These instructions apply to anyone upgrading to Magento Open Source (formerly Community Edition) or Magento Commerce (formerly Enterprise Edition) version 2.1 (including a Release Candidate). 
->>>>>>> 7426bccfb1b6f693906e891c0a8fc64252122815
 
 See one of the following sections for more information: