fix conflict

wangzhengquan

2020-07-28 b7228c8620a6a0b593f1d8b82af5aac7ba456a85

 src/queue/include/shm_queue.h

@@ -68,8 +68,8 @@
      }
    }
    if (!found) {
      // mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
      // delete mqueue;
      mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
      delete mqueue;
      hashtable_remove(hashtable, *keyItr);
    }
  }