25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-07 14:58:56 +02:00

Fixed conflict

SVN Revision: 887
This commit is contained in:
Alexey Shchepin 2007-08-24 16:18:46 +00:00
parent a8bc3a46af
commit 24ff98d50d
3 changed files with 0 additions and 7 deletions

View File

@ -3,12 +3,10 @@
%%% Author : Alexey Shchepin <alexey@sevcom.net>
%%% Purpose : MUC room stuff
%%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@sevcom.net>
%%% Id : $Id$
%%%----------------------------------------------------------------------
-module(mod_muc_room).
-author('alexey@sevcom.net').
-vsn('$Revision$ ').
-behaviour(gen_fsm).

View File

@ -7,10 +7,6 @@
-module(mod_roster).
-author('alexey@sevcom.net').
v v v v v v v
*************
-vsn('$Revision$ ').
^ ^ ^ ^ ^ ^ ^
-behaviour(gen_mod).

View File

@ -10,7 +10,6 @@
-module(ejabberd_web_admin).
-author('alexey@sevcom.net').
-vsn('$Revision$ ').
%% External exports
-export([process/2,