From 43d75ba07d821015ccee7046054a4ab061d3d447 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 6 Dec 2018 11:17:04 -0500
Subject: [PATCH] Fleet Module - Move database stuff to the fleet module

---
 salt/top.sls | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/salt/top.sls b/salt/top.sls
index fcd9ba98d..05e027a84 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -20,11 +20,7 @@ base:
     - firewall
     - master
     - idstools
-<<<<<<< HEAD
-    - redis
     - mysql
-=======
->>>>>>> 7816c6e18e21870b0249cc05a161ef1644a94066
     - elasticsearch
     - logstash
     - kibana
@@ -36,7 +32,7 @@ base:
     - filebeat
     - utility
     - schedule
-    - fleet 
+    - fleet
 
 
   'G@role:so-master':