Clean up rlsnotes

RELEASE-NOTES.md

@@ -1,6 +1,5 @@
 ## RELEASE NOTES
 
-<<<<<<< HEAD
 ### Version 2.0.0 - March xx, 2015
 
 -**Migration Guide**
@@ -223,7 +222,7 @@
 - **Table** - Horizontal cell padding has been slightly reduced, and cell borders are slightly lighter.
 - **Transition - Transition no longer checks for vendor prefixed `animation-name` css property. This was introduced in jQuery `1.8`
 - **Visibility** - In returned `calculations` object, `visible` and `hidden` are renamed to `onScreen` and `offScreen`, since this describes more accurately what the value represents.
-=======
+
 ### Version 1.12.2 - May 4, 2015
 
 **Bugs**
@@ -238,8 +237,6 @@
 - **Progress* - Fixes rounding error in precision settings *Thanks @aaroncox*
 - **Popup** - Removes `min-width: moz-max-content` from popups, which may cause display differences between chrome and FF
 
->>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
-
 ### Version 1.12.0 - April 13, 2015
 
 **Enhancements**