From 2a2a47b5c6678a7edc97d02dea62174a9966c9dd Mon Sep 17 00:00:00 2001 From: Mickael Remond Date: Fri, 1 Apr 2016 12:12:19 +0200 Subject: [PATCH] Fix merge issues --- Makefile.in | 3 --- include/ejabberd_commands.hrl | 1 - 2 files changed, 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 28c05166e..0d9134485 100644 --- 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 5874b3d26..81be06dc3 100644 --- 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',