From: Steve Sutton Date: Wed, 20 Aug 2014 15:29:23 +0000 (-0400) Subject: fix conflicts X-Git-Tag: v1.1.30^2~27 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5ba9d56c63a301d9dc0a2aad7198e90fbe05e456;p=web%2FKeweenaw.git fix conflicts --- 5ba9d56c63a301d9dc0a2aad7198e90fbe05e456