From f4f26534f8a8e460a09e37a17ff12462b5b597ed Mon Sep 17 00:00:00 2001
From: Armin Felder <armin.felder@osalliance.com>
Date: Fri, 23 Nov 2018 17:44:57 +0100
Subject: [PATCH] remove mergeconfilct
---
rocketchatserver.cpp | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/rocketchatserver.cpp b/rocketchatserver.cpp
index 497d6b6..023d0c8 100755
--- a/rocketchatserver.cpp
+++ b/rocketchatserver.cpp
@@ -1817,16 +1817,6 @@ void RocketChatServerData::cancelUpload( const QString &pFileId )
}
}
-void RocketChatServerData::getRoomInformation( const QString &pRoomName )
-{
- QJsonArray params;
- params.append( pRoomName );
-
- QSharedPointer<RocketChatSubscribeChannelRequest> roomSubscription( new RocketChatSubscribeChannelRequest( pRoomName ) );
-
- sendDdprequest( roomSubscription );
-}
-
void RocketChatServerData::getLoginMethods()
{
DdpCallback success = [ = ]( QJsonObject pResponse, MeteorDDP * pDdpApi ) {
--
GitLab