fix conflict

jimi-wzq

2020-08-01 695953440565103964e816e7326c66f3d171c3e0

 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);
    }
  }