Fix weird merge conflict

This commit is contained in:
C. R. Oldham 2019-06-18 15:00:43 -06:00
parent 96431972ac
commit 9c03423ba0
No known key found for this signature in database
GPG Key ID: 4C459F14F101954A

View File

@ -12,3 +12,6 @@ To fix `#53411`_ a new configuration parameter `event_listen_queue_max_seconds`
When this is set to a value greater than 0 and `event_listen_queue` is not 0, if the oldest event
in the listen queue is older than `event_listen_queue_max_seconds`, the queue will be flushed to
returners regardless of how many events are in the queue.
.. _`#53411`: https://github.com/saltstack/salt/issues/53411