fixing header conflict in git
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:42:46 +0000 (16:42 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:42:46 +0000 (16:42 -0500)
commit5747267da6ab7793078365f6d018969e35c194d1
tree922703c8982545ddb1010add145ef328fe0df520
parent74d02fdba4f08161b57cb159eba49ced682436ad
fixing header conflict in git

fixing git conflict in header app.css version
header.php
style.css