Merge branch '2.0' into 2.1

Conflicts:
	CMakeLists.txt
	include/modules.h
	include/serialize.h
	modules/commands/bs_assign.cpp
	modules/commands/bs_badwords.cpp
	modules/commands/bs_bot.cpp
	modules/commands/bs_control.cpp
	modules/commands/bs_kick.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_akick.cpp
	modules/commands/cs_drop.cpp
	modules/commands/cs_entrymsg.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_invite.cpp
	modules/commands/cs_kick.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_register.cpp
	modules/commands/cs_seen.cpp
	modules/commands/cs_set.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_topic.cpp
	modules/commands/cs_unban.cpp
	modules/commands/cs_xop.cpp
	modules/commands/hs_del.cpp
	modules/commands/hs_list.cpp
	modules/commands/hs_request.cpp
	modules/commands/ms_ignore.cpp
	modules/commands/ms_send.cpp
	modules/commands/ns_recover.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_dns.cpp
	modules/commands/os_noop.cpp
	modules/commands/os_oper.cpp
	modules/commands/os_session.cpp
	modules/database/db_sql_live.cpp
	modules/encryption/enc_bcrypt.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_ldap_oper.cpp
	modules/fantasy.cpp
	modules/m_dnsbl.cpp
	modules/m_sasl.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	modules/webcpanel/webcpanel.cpp
	modules/webcpanel/webcpanel.h
	src/command.cpp
	src/messages.cpp
	src/modulemanager.cpp
	src/regchannel.cpp
	src/serialize.cpp

1 files changed, 12 insertions, 0 deletions

diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index b46b2efc5..b97ffe238 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -171,6 +171,7 @@ class CommandOSSeen : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
 	{
+<<<<<<< HEAD
 		source.Reply(_("The \002STATS\002 command prints out statistics about stored nicks and memory usage.\n"
 		               "The \002CLEAR\002 command lets you clean the database by removing all entries from the entries from the database that were added within \037time\037.\n"
 		               "\n"
@@ -178,6 +179,17 @@ class CommandOSSeen : public Command
 		               "         {0} CLEAR 30m\n"
 		               "         Will remove all entries that were added within the last 30 minutes."),
 		               source.command);
+=======
+		this->SendSyntax(source);
+		source.Reply(" ");
+		source.Reply(_("The \002STATS\002 command prints out statistics about stored nicks and memory usage."));
+		source.Reply(_("The \002CLEAR\002 command lets you clean the database by removing all entries from the\n"
+				"database that were added within \037time\037.\n"
+				" \n"
+				"Example:\n"
+				" %s CLEAR 30m\n"
+				" Will remove all entries that were added within the last 30 minutes."), source.command.c_str());
+>>>>>>> 2.0
 		return true;
 	}
 };