From 881e2c561c5c9de3fe4bb962da256552fa03d796 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 4 Jul 2011 11:26:46 -0600 Subject: [PATCH] Merge README changes --- memcache/README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/memcache/README.md b/memcache/README.md index 6c17201..a6845d9 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 additional functionality are: ->>>>>>> ef7ec94c1f67f7e0733774564a4ed848ff169eba * Support for flags field with get and set functions. This is required as memstore stores bit flags denoting -- 2.34.1