Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-07-02 23:06:21 +02:00
Code Releases Activity

fix merge issue

Browse Source
This commit is contained in:
Christophe Romain 2010-08-30 11:14:57 +02:00
parent 23b28ec60f
commit c03140d4be
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/odbc/ejabberd_odbc.erl
View File

@ -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,