merging in master
@@ -82,10 +82,8 @@ class io_queue_api
public: int drop(dmtr_qtoken_t qt);
public: int is_qd_valid(bool &flag, int qd);
-<<<<<<< HEAD
-=======
private: static void on_poll_failure(dmtr_qresult_t * const qr_out, io_queue_api *self);
->>>>>>> origin/master
+
};
} // namespace dmtr
