Fix merge issues

diff --git a/Makefile.in b/Makefile.in
index 28c05166e70455ab5f61c7e640e44b10ba0c38ed..0d9134485d7ba70f390c86f4822f90b0975eea84 100644 (file)
--- 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

diff --git a/include/ejabberd_commands.hrl b/include/ejabberd_commands.hrl
index 5874b3d26c98b80976804d13388fc950c3bd4f59..81be06dc36e4d0f6b38200959a792bc881834cbd 100644 (file)
--- 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',