Fix merge conflicts

This commit is contained in:
Promofaux 2016-03-24 23:18:14 +00:00
commit 1e6ac33ef1
9 changed files with 138 additions and 118 deletions

View file

@ -1,7 +1,7 @@
# Automated Install
##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet/Wi-Fi adapter)
# Automated Install
##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), and also works on most Debian based distros!
1. Install Raspbian
1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines
2. Run the command below
### ```curl -L https://install.pi-hole.net | bash```