fix conflict

jimi-wzq

2020-08-01 695953440565103964e816e7326c66f3d171c3e0

 src/queue/include/hashtable.h

@@ -31,7 +31,7 @@
 * });
 * 
*/
void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb);
void hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)>  cb);

// void hashtable_printall(hashtable_t *hashtable);