fix merge conflict.

This commit is contained in:
David Newhall II
2019-06-14 00:37:44 -07:00
parent 3d89c3fcba
commit ba0c348340
5 changed files with 22 additions and 73 deletions

1
.gitignore vendored
View File

@@ -4,7 +4,6 @@
/unifi-poller*.1
/unifi-poller*.deb
/unifi-poller*.rpm
/unifi-poller*.pkg
/unifi-poller.macos
/unifi-poller.linux
/unifi-poller.rb