X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce;hb=79ad5be1d7ef80332ec9b06da733b862dc35e46f;hp=99c942d8cf6f3a3e8ecda4028192637a94050738;hpb=9cfbe639c04a9308a37c012f741845f2b51f0f42;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 99c942d8..6f3b0f5d 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -31,12 +31,16 @@ 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;