From 01a4f7c750e67d742fa397d3c6df098feca50b97 Mon Sep 17 00:00:00 2001
From: 9S <strrrn@gmail.com>
Date: Tue, 27 Aug 2019 15:40:49 +0200
Subject: [PATCH] Update elk-hole - vis_enhanced.json

---
 json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json b/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json
index d75ebe7..818799b 100644
--- a/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json	
+++ b/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json	
@@ -323,8 +323,4 @@
     },
     "_references": []
   }
-<<<<<<< HEAD
 ]
-=======
-]
->>>>>>> 3527227e4fc49b9323cb01c5f261b39b07553b11
-- 
GitLab