From 7c2f01ed473da2d418a2aa151fc7cac18657867f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 15 Oct 2008 09:23:47 +0200
Subject: syslog-ng comparison had artefacts from merge conflicts

---
 doc/rsyslog_ng_comparison.html | 8 --------
 1 file changed, 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
-- 
cgit