From: Steven Black <redacted>
Date: Tue, 7 Mar 2017 05:35:50 +0000 (-0500)
Subject: Merge pull request #260 from seaside98/patch-1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=2f10d40a305467f1194822b6d803f485cc34d0ae;p=stevenblack-hosts.git

Merge pull request #260 from seaside98/patch-1

Add documentation on how to pull this repo without conflicts
---

2f10d40a305467f1194822b6d803f485cc34d0ae