resolve conflict

XiaoMi · Aug 24, 2020 · 912122a · 912122a
1 parent b8b4b81
commit 912122a
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/include/dsn/tool-api/network.h b/include/dsn/tool-api/network.h
@@ -304,8 +304,6 @@ class rpc_session : public ref_counter
     void clear_send_queue(bool resend_msgs);
     bool on_disconnected(bool is_write);
     bool is_auth_success(message_ex *msg);
-    void on_failure(bool is_write = false);
-    void on_success();
 
 protected:
     // constant info