From:  <brian@gir>
Date: Sun, 20 Apr 2008 23:15:12 +0000 (-0700)
Subject: Fixing merge
X-Git-Tag: _20~1^2~14^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d48f4bbb5d5bee5ab3bed6f479558ef1fa74b58f;p=m6w6%2Flibmemcached

Fixing merge
---

d48f4bbb5d5bee5ab3bed6f479558ef1fa74b58f
diff --cc libmemcached/memcached.h
index 01a6cb92,99c942d8..6f3b0f5d
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@@ -31,7 -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;