Fixed oops in conflict merge

SuperTux88 · Sep 22, 2015 · 204c77d · 204c77d
1 parent 3322436
commit 204c77d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -41,11 +41,7 @@ Forget buying me a beer (don't drink anyways)... they're going to pay off studen
 
 ## Release Notes
 
-<<<<<<< HEAD
 ### Version 3.0.0 
-=======
-### Version 2.7.2
->>>>>>> 281f8d180f70e11ca389995f2020ab815a34872e
 - Updated support for Bitbucket Server (previously known as Stash)
 
 ### Version 2.7.1