aboutsummaryrefslogtreecommitdiff
path: root/include/clientprotocol.h
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-05-05 22:03:14 +0100
committerGravatar Sadie Powell2020-05-05 22:03:14 +0100
commitb755d2a778e0adb86c3b10757083c169eedb6de6 (patch)
tree3d737ea47c535c4b60076feb26055e68f7d8aec5 /include/clientprotocol.h
parentRevert "Convert UserType to an enum class". (diff)
parentFix shuns not being applied correctly. (diff)
Merge branch 'insp3' into master.
Diffstat (limited to 'include/clientprotocol.h')
-rw-r--r--include/clientprotocol.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index 7320525a8..64383e0a6 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -690,7 +690,7 @@ class CoreExport ClientProtocol::Serializer : public DataProvider
* @param tagname Name of the tag.
* @param tagvalue Tag value, may be empty.
* @param tags TagMap to place the tag into, if it gets accepted.
- * @return True if no error occured, false if the tag name is invalid or if this tag already exists.
+ * @return True if no error occurred, false if the tag name is invalid or if this tag already exists.
*/
bool HandleTag(LocalUser* user, const std::string& tagname, std::string& tagvalue, TagMap& tags) const;