conflicts resolved

author antirez <antirez@gmail.com>

Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)

committer antirez <antirez@gmail.com>

Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)
author antirez <antirez@gmail.com>
Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)
committer antirez <antirez@gmail.com>
Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)
diff --cc redis.c
Simple merge
diff --cc redis.conf
Simple merge
author	antirez <antirez@gmail.com>
	Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)
committer	antirez <antirez@gmail.com>
	Thu, 13 May 2010 12:24:41 +0000 (14:24 +0200)
		1	2
redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
redis.conf	patch \|	diff1 \|	diff2 \|	blob \| history