ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-05 08:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase server

Browse Source
This commit is contained in:
Nathan Nichols
2021-06-14 09:42:45 -05:00
committed by CJ Cobb
parent f058e6b79d
commit 31e26f686e
8 changed files with 178 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/SubscriptionManager.h
View File

@@ -20,16 +20,10 @@
#ifndef SUBSCRIPTION_MANAGER_H
#define SUBSCRIPTION_MANAGER_H
<<<<<<< HEAD:server/SubscriptionManager.h
#include <server/session.h>
#include <memory>
#include <set>
=======
#include <set>
#include <memory>
#include <reporting/server/WsSession.h>
>>>>>>> 27506bc (rebase handlers):reporting/server/SubscriptionManager.h
class WsSession;
@@ -105,17 +99,10 @@ public:
std::shared_ptr<session>& session);
void
<<<<<<< HEAD:server/SubscriptionManager.h
subProposedTransactions(std::shared_ptr<session>& session);
void
unsubProposedTransactions(std::shared_ptr<session>& session);
=======
subAccount(ripple::AccountID const& account, std::shared_ptr<WsSession>& session);
void
unsubAccount(ripple::AccountID const& account, std::shared_ptr<WsSession>& session);
>>>>>>> 27506bc (rebase handlers):reporting/server/SubscriptionManager.h
};
#endif // SUBSCRIPTION_MANAGER_H