fix conflict

wangzhengquan

2020-07-28 b7228c8620a6a0b593f1d8b82af5aac7ba456a85

 src/queue/include/shm_mm.h

@@ -18,8 +18,6 @@
 */
void shm_destroy();

void* shm_malloc_by_key(int key, int size);


#ifdef __cplusplus
}