fix merge conflict
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:03 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:03 +0000 (11:40 -0400)
commitf62435dd7d074401ad440d3410ab1bb77d962ac5
tree66197f6a88a6ca01a2c70950b4452c2ab4d97a30
parent6c57891ec4ba0105b7966e99b7c1bb801277a8a2
parent597dd33eec83fc0e9f147897ba80258bced0e879
fix merge conflict