diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2007-08-24 16:18:46 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2007-08-24 16:18:46 +0000 |
| commit | 24ff98d50d551c21a92177347a377888a853350f (patch) | |
| tree | 572a21dd7fb0e083f11c24c006573606b4449c1e /src | |
| parent | * src/web/ejabberd_web_admin.erl: Moved roster stuff to mod_roster* (diff) | |
Fixed conflict
SVN Revision: 887
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 2 | ||||
| -rw-r--r-- | src/mod_roster.erl | 4 | ||||
| -rw-r--r-- | src/web/ejabberd_web_admin.erl | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 998b89c3a..8c84c1fe9 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -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). diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 3955fad00..4fdbce1f6 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -7,10 +7,6 @@ -module(mod_roster). -author('alexey@sevcom.net'). -v v v v v v v -************* --vsn('$Revision$ '). -^ ^ ^ ^ ^ ^ ^ -behaviour(gen_mod). diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 8d5fff382..ade323cf6 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -10,7 +10,6 @@ -module(ejabberd_web_admin). -author('alexey@sevcom.net'). --vsn('$Revision$ '). %% External exports -export([process/2, |