fix conflict

jimi-wzq

2020-08-01 695953440565103964e816e7326c66f3d171c3e0

 src/queue/include/shm_mm.h

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

int shm_alloc_key();


#ifdef __cplusplus
}