From: Jeffrey McClain <jeffreywmcclain@gmail.com>
Date: Wed, 22 Aug 2018 16:35:59 +0000 (-0700)
Subject: Fix GitHub Desktop Weird Formatting and Additions
X-Git-Tag: v1.2~8^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/a5d443b535e3a3b8760692d127da55a4d5231f3c?ds=sidebyside;hp=a5d443b535e3a3b8760692d127da55a4d5231f3c

Fix GitHub Desktop Weird Formatting and Additions

Seems like Github Desktop added some lines like "<<<<< HEAD"
---