From 148065628cc9057c586260771b8034aac4f104ec Mon Sep 17 00:00:00 2001
From: Ryan Faircloth <rfaircloth@splunk.com>
Date: Tue, 30 Jul 2019 15:51:03 -0400
Subject: [PATCH] Update syslog-ng.conf

---
 package/etc/syslog-ng.conf | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/etc/syslog-ng.conf b/package/etc/syslog-ng.conf
index a86a78d..565b79e 100644
--- a/package/etc/syslog-ng.conf
+++ b/package/etc/syslog-ng.conf
@@ -21,10 +21,7 @@ options {
         chain_hostnames (off);
         use_dns (no);
         use_fqdn (no);
-<<<<<<< HEAD
-=======
         dns-cache(no);
->>>>>>> master
         create_dirs (no);
         keep-hostname (yes);
         create_dirs(yes);
@@ -64,17 +61,10 @@ options {
 # ===============================================================================================
 @define ip-version 4
 @define splunk-max-connections 1000
-<<<<<<< HEAD
 @define splunk-log-fifo-size 180000000
 @define splunk-fetch-limit 20000
 # make sure splunk-window-size >= splunk-max-connections * splunk-fetch-limit
 @define splunk-window-size 20000000
-=======
-@define splunk-log-fifo-size 10000
-@define splunk-fetch-limit 100
-# make sure splunk-window-size >= splunk-max-connections * splunk-fetch-limit
-@define splunk-window-size 100000
->>>>>>> master
 @define splunk-rcvbuf 425984
 @define default-timezone "GMT"