diff options
| author |  Sadie Powell | 2020-05-05 22:03:14 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-05-05 22:03:14 +0100 |
| commit | b755d2a778e0adb86c3b10757083c169eedb6de6 (patch) | |
| tree | 3d737ea47c535c4b60076feb26055e68f7d8aec5 /src/modules/m_spanningtree/ftopic.cpp | |
| parent | Revert "Convert UserType to an enum class". (diff) | |
| parent | Fix shuns not being applied correctly. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree/ftopic.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/ftopic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index aa669ce49..2f9813860 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -50,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, Params& params) /* * If the topics were updated at the exact same second, accept * the remote only when it's "bigger" than ours as defined by - * string comparision, so non-empty topics always overridde + * string comparison, so non-empty topics always overridde * empty topics if their timestamps are equal * * Similarly, if the topic texts are equal too, keep one topic |