summaryrefslogtreecommitdiff
path: root/include/rabbit.hrl
diff options
context:
space:
mode:
authorVlad Alexandru Ionescu <vlad@rabbitmq.com>2010-10-14 20:26:19 +0100
committerVlad Alexandru Ionescu <vlad@rabbitmq.com>2010-10-14 20:26:19 +0100
commitba4c0e4ab3eddbc9422f838fe74bda34b658e954 (patch)
tree3193173e5ff818ea54063653ced094d8c868bfd7 /include/rabbit.hrl
parent99361562792325603fb7ca1a7e5886198bf079dc (diff)
downloadrabbitmq-server-git-ba4c0e4ab3eddbc9422f838fe74bda34b658e954.tar.gz
fixing merge conflicts
Diffstat (limited to 'include/rabbit.hrl')
-rw-r--r--include/rabbit.hrl2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 59e39d920e..282be0019e 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -67,7 +67,7 @@
-record(topic_trie_binding, {trie_binding, value = const}).
-record(trie_edge, {exchange_name, node_id, word}).
--record(trie_binding, {exchange_name, node_id, queue_name}).
+-record(trie_binding, {exchange_name, node_id, destination}).
-record(listener, {node, protocol, host, port}).