Merge README changes

[memstore.git] / memcache / README.md

diff --git a/memcache/README.md b/memcache/README.md
index 6c172014792125f0dff11d498ba6694ea5c9aa85..a6845d976045660ae677b738e67df90e194b3b7f 100644 (file)
--- a/memcache/README.md
+++ b/memcache/README.md
@@ -12,17 +12,10 @@ Date Started: July 1, 2011
 Overview
 --------
 
-<<<<<<< HEAD
-This package is based on the `cl-memcached` library.
-It is substantially modified for use with the memstore
-package. The primary areas of additional functionality
-are:
-=======
-This package is based on the cl-memcached library.  It is
+This package is based on the `cl-memcached` library.  It is
 substantially modified for use with the
 [memstore](http://memstore.b9.com) library. The primary areas of
 additional functionality are:
->>>>>>> ef7ec94c1f67f7e0733774564a4ed848ff169eba
 
 * Support for flags field with get and set functions.
   This is required as memstore stores bit flags denoting