From c5e8a136162fea3e59e3c31e9d89de10c8804213 Mon Sep 17 00:00:00 2001
From: Imron Alston <imron@imralsoftware.com>
Date: Fri, 15 Dec 2017 01:28:24 +0000
Subject: [PATCH] updated readme

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index a5e7f08..b1f824f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 Scalyr output plugin for Fluentd
 =========================
 
-<<<<<<< 259dd389ad017ec28e8f929f4cc805e9d4a640b3
 **Note:** Fluentd introduced breaking changes to their plugin API between
 version 0.12 and 0.14.