From a4241efdf86abfce249978de674d907ee5ad684f Mon Sep 17 00:00:00 2001
From: Steven Black <steveb@stevenblack.com>
Date: Tue, 30 Jul 2013 21:36:14 -0400
Subject: [PATCH] Whoops, corrected an section that somehow went unresolved.

---
 readme.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/readme.md b/readme.md
index 613fc0809..09f5dfd9d 100644
--- a/readme.md
+++ b/readme.md
@@ -2,13 +2,9 @@
 
 This repo consolidates several reputable `hosts` files and consolidates them into a single hosts file that you can use.
 
-<<<<<<< HEAD
-Last updated: June 6, 2013
+Last updated: July 30, 2013
 
-**Currently this hosts file contains 23,073 unique entries.**
-=======
 **Currently this hosts file contains 22887 unique entries.**
->>>>>>> 3d234cab9c026ef6719da9dab9657cf535ddb61b
 
 ## Source of host data amalgamated here