fix conflict
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Jan 2016 18:40:52 +0000 (13:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Jan 2016 18:40:52 +0000 (13:40 -0500)
commitfd31031300a72b58048278d4cbb0aa635e2ea96c
tree69ba2264f208e5416672e6ae8b4d3a4be184ade8
parent1b3ffe272609f022ad811664ba1a7e57644a555a
parent55e35741b71d0e868520fa1c99d71e464329bbbb
fix conflict
functions.php