From 88a8675c802ba1954538bd2983a28ccbc41f2c02 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 31 Jul 2016 12:00:32 +0100 Subject: [PATCH] Fix bad merge --- modules/modperl/module.h | 2 +- modules/modpython/module.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/modperl/module.h b/modules/modperl/module.h index 182dbc2c..792d6123 100644 --- a/modules/modperl/module.h +++ b/modules/modperl/module.h @@ -82,7 +82,7 @@ class ZNC_EXPORT_LIB_EXPORT CPerlModule : public CModule { void OnJoin(const CNick& Nick, CChan& Channel) override; void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override; - void EModRet OnInvite(const CNick& Nick, const CString& sChan) override; + EModRet OnInvite(const CNick& Nick, const CString& sChan) override; EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override; EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override; EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client, diff --git a/modules/modpython/module.h b/modules/modpython/module.h index e7d7829c..38f22190 100644 --- a/modules/modpython/module.h +++ b/modules/modpython/module.h @@ -102,7 +102,7 @@ class ZNC_EXPORT_LIB_EXPORT CPyModule : public CModule { void OnJoin(const CNick& Nick, CChan& Channel) override; void OnPart(const CNick& Nick, CChan& Channel, const CString& sMessage) override; - void EModRet OnInvite(const CNick& Nick, const CString& sChan) override; + EModRet OnInvite(const CNick& Nick, const CString& sChan) override; EModRet OnChanBufferStarting(CChan& Chan, CClient& Client) override; EModRet OnChanBufferEnding(CChan& Chan, CClient& Client) override; EModRet OnChanBufferPlayLine(CChan& Chan, CClient& Client,