Merge branch 'master' of localhost:/srv/git/ansible

2019-07-22 16:48:52 -04:00
parent d181aee61d 61a0501e7a
commit 1f3406d9eb
2 changed files with 75 additions and 112 deletions
--- a/roles/ntopng/tasks/main.yaml
+++ b/roles/ntopng/tasks/main.yaml
@@ -24,6 +24,7 @@
          chdir: "{{ ansible_user_dir }}/ntopng"
 - name: install
  become: yes
+<<<<<<< HEAD
  command: "make install"
  args:
          chdir: "{{ ansible_user_dir }}/ntopng"