- fix merge conflict for ntopng

2019-07-22 16:51:42 -04:00
parent 1f3406d9eb
commit 5466f65dd2
1 changed files with 0 additions and 1 deletions
--- 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"