Merge Conflict resolution

This commit is contained in:
Dan Schaper
2016-07-27 18:54:41 -07:00
3 changed files with 5 additions and 6 deletions

View File

@@ -1,5 +1,7 @@
# Automated Install
[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=3011939)](https://www.bountysource.com/trackers/3011939-pi-hole-pi-hole?utm_source=3011939&utm_medium=shield&utm_campaign=TRACKER_BADGE)
Designed For Raspberry Pi A+, B, B+, 2, 3B, and Zero (with an Ethernet/Wi-Fi adapter)
Works on most Debian and CentOS/RHEL based distributions!