From c03140d4be9e0e8a691881f74548bc7ff4fccb5a Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Mon, 30 Aug 2010 11:14:57 +0200
Subject: [PATCH] fix merge issue

---
 src/odbc/ejabberd_odbc.erl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index 84619eccd..dc23dd928 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -39,13 +39,9 @@
 	 sql_bloc/2,
 	 escape/1,
 	 escape_like/1,
-<<<<<<< HEAD
+	 to_bool/1,
 	 keep_alive/1,
 	 sql_query_on_all_connections/2]).
-=======
-	 to_bool/1,
-	 keep_alive/1]).
->>>>>>> mainline/2.1.x
 
 %% gen_fsm callbacks
 -export([init/1,