updating readme

jeffsu · Sep 13, 2012 · f880d08 · f880d08
1 parent ff3296f
commit f880d08
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -50,7 +50,6 @@ services:
 ```
 
 ### Services
-<<<<<<< Updated upstream
 
 Services are a way of grouping several sensor checks together.  In the example above, we have a "google" service w
 hich we check by making a get request to "http://www.google.com" and also seeing if we have a connection to port 8