summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/rabbitmqctl.1.pod3
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index fd8918cd9b..d2cb019973 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -157,12 +157,9 @@ messages_unacknowledged
messages_uncommitted
number of messages published in as yet uncommitted transactions
-<<<<<<< local
-=======
messages
sum of ready, unacknowledged and uncommitted messages
->>>>>>> other
acks_uncommitted
number of acknowledgements received in as yet uncommitted