CHANGELOG.md in sensu-plugins-sip-0.0.1 vs CHANGELOG.md in sensu-plugins-sip-0.0.2
- old
+ new
@@ -3,13 +3,9 @@
This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
## Unreleased][unreleased]
-<<<<<<< HEAD
-=======
## 0.0.1 - 2015-04-30
### Added
- initial release
-
->>>>>>> update repos