Fix merge issues

2016-04-01 12:12:19 +02:00 · 2016-04-01 12:12:19 +02:00 · 2a2a47b5c6
parent b5f1479763
commit 2a2a47b5c6
2 changed files with 0 additions and 4 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -336,9 +336,6 @@ test:
 quicktest:
 	$(REBAR) skip_deps=true ct suites=elixir

-eunit:
-	$(REBAR) skip_deps=true exunit
-
 .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
 	install uninstall uninstall-binary uninstall-all translations deps test spec \
 	quicktest erlang_plt deps_plt ejabberd_plt
--- a/include/ejabberd_commands.hrl
+++ b/include/ejabberd_commands.hrl
@ -32,7 +32,6 @@
         desc = ""               :: string() | '_' | '$3',
         longdesc = ""           :: string() | '_',
 	 version = 0             :: integer(),
-	 jabs = 1                :: integer(),
 	 module                  :: atom() | '_',
         function                :: atom() | '_',
         args = []               :: [aterm()] | '_' | '$1' | '$2',