minor fix

2020-03-13 14:15:50 +01:00 · 2020-03-13 14:15:50 +01:00 · 3ba86f7cd8
commit 3ba86f7cd8
parent 824395a258
1 changed files with 0 additions and 4 deletions
--- 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