fix conflict
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:54:35 +0000 (15:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:54:35 +0000 (15:54 -0500)
commitca77f73f23106e716dbadbc6086540f7ccd659c6
tree21834d4b17a152efac400294d6fc76b7d08dc194
parent88b32230eb754869a06a9aed2e8150d4ba5eb981
parent1090006bd5ce3a363437d448b8341efe19397a3e
fix conflict
functions.php