From 3ba86f7cd8d30da34a81373881f7bf7ada71b681 Mon Sep 17 00:00:00 2001
From: Zenidd <jpsaezgutierrez@gmail.com>
Date: Fri, 13 Mar 2020 14:15:50 +0100
Subject: [PATCH] minor fix

---
 roles/elastic-stack/ansible-kibana/defaults/main.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml
index 7f5d17c8..e930eae7 100644
--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@@ -43,11 +43,7 @@ nodejs:
   repo_dict:
       debian: "deb"
       redhat: "rpm"
-<<<<<<< HEAD
-  repo_url_ext: "nodesource.com/setup_8.x"
-=======
   repo_url_ext: "nodesource.com/setup_10.x"
->>>>>>> feature-node_options-variable
 
 # Build from sources
 build_from_sources: false