From 5466f65dd26941ed26d900e157ec626b8ddc434e Mon Sep 17 00:00:00 2001
From: Pi <pi@sdwan.comcast.com>
Date: Mon, 22 Jul 2019 16:51:42 -0400
Subject: [PATCH] - fix merge conflict for ntopng

---
 roles/ntopng/tasks/main.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/ntopng/tasks/main.yaml b/roles/ntopng/tasks/main.yaml
index 822a91b..6866e12 100644
--- a/roles/ntopng/tasks/main.yaml
+++ b/roles/ntopng/tasks/main.yaml
@@ -24,7 +24,6 @@
           chdir: "{{ ansible_user_dir }}/ntopng"
 - name: install
   become: yes
-<<<<<<< HEAD
   command: "make install"
   args:
           chdir: "{{ ansible_user_dir }}/ntopng"