Merge fix

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index bd2723e204cb39b6514f22fd39caefc1c7f44ff0..18cdf23aac2ebf3dfed0326d2470c2ce43a299a7 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -27,7 +27,7 @@ noinst_HEADERS = libmemcached_probes.h \
 pkginclude_HEADERS= memcached.h \
                    memcached.hh \
                    libmemcached_config.h \
-                   memcached_constants.h \ 
+                   memcached_constants.h \
                    memcached_result.h \
                    memcached_server.h \
                    memcached_storage.h \

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce..cac25a89891e6e98ba9d48129bff046cacb66594 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -31,16 +31,11 @@ extern "C" {
 #define MEMCACHED_VERSION_STRING_LENGTH 12
 
 /* string value */
-<<<<<<< local
-#define LIBMEMCACHED_VERSION_STRING "0.19"
-
 struct continuum_item{
        uint32_t index;
        uint32_t value;
 };
-=======
 #define LIBMEMCACHED_VERSION_STRING "0.20"
->>>>>>> other
 
 struct memcached_stat_st {
   uint32_t pid;