X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=memcache%2FREADME.md;h=c38888bd39b5354744ee3f6b43e01fbcf7ba1d49;hb=84ef300d07331fca7c7e54a57d1cfddec2eeb295;hp=6c172014792125f0dff11d498ba6694ea5c9aa85;hpb=f72989f5a590de4f00a0f830e143b7a5782d26ed;p=memstore.git

diff --git a/memcache/README.md b/memcache/README.md
index 6c17201..c38888b 100644
--- 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
+[memstore](http://memstore.kpe.io) 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
@@ -56,7 +49,7 @@ additional functionality are:
   in statistics are not present.
 
 * Removed compatibility functions in `compat.lisp` by using the
-  [`kmrcl`](http://gitpub.b9.com/kmrcl.git) library to provide those
+  [`kmrcl`](http://gitpub.kpe.io/kmrcl.git) library to provide those
   functions as well as utilitizing other `kmrcl` functions to simplify
   code.