mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-28 17:38:54 +01:00
Fixed conflict
SVN Revision: 887
This commit is contained in:
parent
a8bc3a46af
commit
24ff98d50d
@ -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).
|
||||
|
||||
|
@ -7,10 +7,6 @@
|
||||
|
||||
-module(mod_roster).
|
||||
-author('alexey@sevcom.net').
|
||||
v v v v v v v
|
||||
*************
|
||||
-vsn('$Revision$ ').
|
||||
^ ^ ^ ^ ^ ^ ^
|
||||
|
||||
-behaviour(gen_mod).
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
|
||||
-module(ejabberd_web_admin).
|
||||
-author('alexey@sevcom.net').
|
||||
-vsn('$Revision$ ').
|
||||
|
||||
%% External exports
|
||||
-export([process/2,
|
||||
|
Loading…
Reference in New Issue
Block a user