gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge conflict resolution

Browse Source
This commit is contained in:
nate
2016-03-28 13:07:51 -05:00
parent eaf89995ee
commit f2150ee7e1
4 changed files with 2 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -1,15 +1,5 @@
<<<<<<< HEAD
# Automated Install
##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), and also works on most Debian based distros!
=======
# Automated Install
<<<<<<< HEAD
##### Designed For Raspberry Pi A+, B, B+, 2, Zero, and 3B (with an Ethernet/Wi-Fi adapter)
>>>>>>> PiholeDebug
=======
##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet/Wi-Fi adapter)
>>>>>>> ScriptCleanup
>>>>>>> ScriptCleanup-Dev
##### Designed For Raspberry Pi A+, B, B+, 2, Zero, and 3B (with an Ethernet/Wi-Fi adapter) (Works on most Debian distributions!)
1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines
2. Run the command below