mikepell/dsfin-ansible
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix merge conflict for ntopng

Browse Source
This commit is contained in:
Pi
2019-07-22 16:51:42 -04:00
parent 1f3406d9eb
commit 5466f65dd2
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ntopng/tasks/main.yaml
View File

@@ -24,7 +24,6 @@
chdir: "{{ ansible_user_dir }}/ntopng" chdir: "{{ ansible_user_dir }}/ntopng"
- name: install - name: install
become: yes become: yes
<<<<<<< HEAD
command: "make install" command: "make install"
args: args:
chdir: "{{ ansible_user_dir }}/ntopng" chdir: "{{ ansible_user_dir }}/ntopng"