diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-11-03 12:40:24 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-11-03 12:40:24 +0100 |
| commit | 2c51a2bf17b6c377f0207f3d89b4b3f399fc0178 (patch) | |
| tree | 93f446719933bcfcb2f3580fef778a37c70dc57e /include/channels.h | |
| parent | a2461fb7e1c28e28e64b61256d7a547162a83f6e (diff) | |
| parent | a124a3783d8e8136b63f188bbd292c391811df54 (diff) | |
Merge branch 'master+invite'
Diffstat (limited to 'include/channels.h')
| -rw-r--r-- | include/channels.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/channels.h b/include/channels.h index 4d1d14c13..be84ac800 100644 --- a/include/channels.h +++ b/include/channels.h @@ -34,7 +34,7 @@ * This class represents a channel, and contains its name, modes, topic, topic set time, * etc, and an instance of the BanList type. */ -class CoreExport Channel : public Extensible, public InviteBase<Channel> +class CoreExport Channel : public Extensible { public: /** A map of Memberships on a channel keyed by User pointers |