Clean up release process

File yuckies

Author: BlitzErik

Documentation/Development/ReleaseProcess.md

@@ -45,7 +45,6 @@ Well, useful is probably the wrong word. More like entertaining. Here we go.
 
 * Copy the FRK scripts into BrentOzar.com's First Responder Kit zip file (Employees/Products/First Responder Kit/FirstResponderKit.zip)
 * Copy the FirstResponderKit.zip into Employees/Public.BrentOzar
-<<<<<<< HEAD
 * For PowerBi, only keep the .pbit file
 * Copy the Github release text into a WordPress blog post with the First Responder Kit Updates category. The nice thing about doing the Github release first is that you should be able to copy/paste the Github release page and the HTML should paste smoothly into the WordPress draft window, complete with links to the Github issues. At the end of the post, put a download now link that points to: https://www.brentozar.com/first-aid/
 
@@ -59,5 +58,3 @@ When you have questions about how the tools work, talk with the community in the
 When you find a bug or want something changed, read the <a href="https://github.com/BrentOzarULTD/SQL-Server-First-Responder-Kit/blob/master/CONTRIBUTING.md" target="_blank" rel="noopener">contributing.md</a> file.
 
 When you have a question about what the scripts found, first make sure you read the "More Details" URL for any warning you find. We put a lot of work into documentation, and we wouldn't want someone to yell at you to go read the fine manual. After that, when you've still got questions about how something works in SQL Server, post a question at <a href="http://dba.stackexchange.com" target="_blank" rel="noopener">DBA.StackExchange.com</a> and the community (that includes us!) will help. Include exact errors and any applicable screenshots, your SQL Server version number (including the build #), and the version of the tool you're working with.
->>>>>>> dev
-