From e613761e676599be5b98770e3b798a8a78244759 Mon Sep 17 00:00:00 2001 From: Date: Sun, 20 Apr 2008 18:01:05 -0700 Subject: [PATCH] Merge fix --- libmemcached/Makefile.am | 2 +- libmemcached/memcached.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am index bd2723e2..18cdf23a 100644 --- 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 6f3b0f5d..cac25a89 100644 --- 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; -- 2.30.2