Commit 4079e8bf authored by Tim Smith's avatar Tim Smith
Browse files

Remove merge artifact

parent 3be02e7c
......@@ -100,7 +100,6 @@ For example, to change this to just the hostname, set the attribute `node['rsysl
At this time, the server can only listen on UDP *or* TCP.
<<<<<<< HEAD
......@@ -132,7 +131,6 @@ Usage
Use `recipe[rsyslog]` to install and start rsyslog as a basic
configured service for standalone systems.
>>>>>>> add file_input lwrp
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment