README.md in sensu-plugins-twemproxy-0.0.1 vs README.md in sensu-plugins-twemproxy-0.0.2

- old
+ new

@@ -80,8 +80,7 @@
 ```
 
 ## Installation
 
 [Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
->>>>>>> update repo
 
 ## Notes