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

diff --git a/memcache/README.md b/memcache/README.md
index c280b01..6c17201 100644
--- a/memcache/README.md
+++ b/memcache/README.md
@@ -12,10 +12,17 @@ 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
+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
@@ -37,7 +44,7 @@ are:
   supported by `usocket` are now supported with `memcached`.
 
 * Encapsulated reading and writing to socket stream to avoid
-  handling \#return characters in high-level code.
+  handling \\#return characters in high-level code.
 
 * Changes to support the change in statistics fields with membase.
   Some fields were no longer present. Also, membase 1.7 has
@@ -48,9 +55,10 @@ are:
 * More robust `print-object` functions to avoid errors if fields
   in statistics are not present.
 
-* Removed compatibility functions in `compat.lisp` and using `kmrcl`
-  package to provide those functions as well as utilitizing other
-  `kmrcl` functions to simplify code.
+* Removed compatibility functions in `compat.lisp` by using the
+  [`kmrcl`](http://gitpub.b9.com/kmrcl.git) library to provide those
+  functions as well as utilitizing other `kmrcl` functions to simplify
+  code.
 
 * Added functions to support all memcached API commands,
   such as `flush_all` and `version`.