diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-15 09:23:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-15 09:23:47 +0200 |
| commit | 7c2f01ed473da2d418a2aa151fc7cac18657867f (patch) | |
| tree | a4c17ddf9a09e90f7e7e71b3271c2ab6066e00dc | |
| parent | 1913033b91b623377558d3b29da5c7ac1c719a41 (diff) | |
| download | rsyslog-7c2f01ed473da2d418a2aa151fc7cac18657867f.tar.gz rsyslog-7c2f01ed473da2d418a2aa151fc7cac18657867f.tar.xz rsyslog-7c2f01ed473da2d418a2aa151fc7cac18657867f.zip | |
syslog-ng comparison had artefacts from merge conflicts
| -rw-r--r-- | doc/rsyslog_ng_comparison.html | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/doc/rsyslog_ng_comparison.html b/doc/rsyslog_ng_comparison.html index bc99cb8c..2f383f78 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -432,17 +432,9 @@ including ability to present channel and priority as visible log data</td> <td valign="top">yes</td> <td valign="top">yes</td> </tr> -<<<<<<< HEAD:doc/rsyslog_ng_comparison.html -<tr> -<td valign="top">native ability to send mail messages</td> -<td valign="top">yes (<a href="ommail.html">ommail</a>, -introduced in 3.17.0)</td> -<td valign="top">not sure...</td> -======= <tr><td valign="top">native ability to send mail messages</td> <td valign="top">yes (<a href="ommail.html">ommail</a>, introduced in 3.17.0)</td> <td valign="top">no (only via piped external process)</td> ->>>>>>> 3f2856b4b5010dfcaa720b292dc3a655e7b9f6da:doc/rsyslog_ng_comparison.html </tr> <tr> <td valign="top">good timestamp format control; at a |