[forge-commits] [forge/website] 3937eb: Changed index.html to remove conflict

Branch: refs/heads/js-update Home: https://github.com/forge/website Commit: 3937ebabd6904e3cae4fbdfe1ee78bbbd7b74088 https://github.com/forge/website/commit/3937ebabd6904e3cae4fbdfe1ee78bbbd... Author: visuale <james(a)visuale.net&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M app/index.html Log Message: ----------- Changed index.html to remove conflict