Merge branch 'master' of https://github.com/fourtf/chatterino2

2018-02-05 21:20:38 +01:00
parent b351c40d29 556dbe0456
commit a44758ad23
23 changed files with 255 additions and 104 deletions
@@ -139,11 +139,6 @@ ChannelPtr Split::getChannel() const
    return this->channel;
 }

-ChannelPtr &Split::getChannelRef()
-{
-    return this->channel;
-}
-
 void Split::setChannel(ChannelPtr _newChannel)
 {
    this->view.setChannel(_newChannel);