From beb8d64e76c4ae291bed1d17aba5510bb92ab696 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Fri, 28 Aug 2009 02:55:18 +0000
Subject: [PATCH] remove wrong merge

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@678 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 utils.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils.h b/utils.h
index 9446f9a..e63a780 100644
--- a/utils.h
+++ b/utils.h
@@ -181,4 +181,3 @@ static inline void xc_vector_free_impl(xc_vector_t *vector TSRMLS_DC)
 
 #define xc_vector_free(type, vector) xc_vector_free_impl(vector TSRMLS_CC)
 
->>>>>>> .merge-right.r671