diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-01-21 14:17:54 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-01-21 14:17:54 +0000 |
| commit | 399666eeb629bdbc49ba67f9d37cfdaa9da254f3 (patch) | |
| tree | 4b3d4d0d1d8cf4945642aac42b4105c5ef65fea7 | |
| parent | 203f14068737cc62156ce16db8df10b37e7fc9c3 (diff) | |
| download | rabbitmq-server-399666eeb629bdbc49ba67f9d37cfdaa9da254f3.tar.gz | |
remove merge conflict markers
| -rw-r--r-- | docs/rabbitmqctl.1.pod | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod index fd8918cd..d2cb0199 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 |