Fixing a merge issue for previous commit
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:02 +0000 (10:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:02 +0000 (10:44 -0500)
commit1506dbaf03c77eca18020daafb7582966c203cba
treea62b34f75259bd19fe3a8544ea85637a2ce9de91
parent6076bfb87a359a9213dbdbc611a2391c1cd8d1e6
parent828584f5d3101913d7f1f249842ca3c28dda6295
Fixing a merge issue for previous commit