From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict

---
 src/queue/include/shm_mm.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/queue/include/shm_mm.h b/src/queue/include/shm_mm.h
index 6f28f13..8aeb202 100644
--- a/src/queue/include/shm_mm.h
+++ b/src/queue/include/shm_mm.h
@@ -18,8 +18,6 @@
  */
 void shm_destroy();
 
-void* shm_malloc_by_key(int key, int size);
-
 
 #ifdef __cplusplus
 }

--
Gitblit v1.8.0