yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

Fix merge issues

Browse source
This commit is contained in:
Mickael Remond 2016-04-01 12:12:19 +02:00
parent b5f1479763
commit 2a2a47b5c6
2 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.in
View file

@ -336,9 +336,6 @@ test:
quicktest: quicktest:
$(REBAR) skip_deps=true ct suites=elixir $(REBAR) skip_deps=true ct suites=elixir
eunit:
$(REBAR) skip_deps=true exunit
.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \ .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
install uninstall uninstall-binary uninstall-all translations deps test spec \ install uninstall uninstall-binary uninstall-all translations deps test spec \
quicktest erlang_plt deps_plt ejabberd_plt quicktest erlang_plt deps_plt ejabberd_plt

1
include/ejabberd_commands.hrl
View file

@ -32,7 +32,6 @@
desc = "" :: string() | '_' | '$3', desc = "" :: string() | '_' | '$3',
longdesc = "" :: string() | '_', longdesc = "" :: string() | '_',
version = 0 :: integer(), version = 0 :: integer(),
jabs = 1 :: integer(),
module :: atom() | '_', module :: atom() | '_',
function :: atom() | '_', function :: atom() | '_',
args = [] :: [aterm()] | '_' | '$1' | '$2', args = [] :: [aterm()] | '_' | '$1' | '$2',