resolve index.html conflict
authorfcdev@sleepless.com <ec2-user@ip-10-166-206-34.us-west-1.compute.internal>
Sun, 20 Nov 2011 03:11:52 +0000 (03:11 +0000)
committerfcdev@sleepless.com <ec2-user@ip-10-166-206-34.us-west-1.compute.internal>
Sun, 20 Nov 2011 03:11:52 +0000 (03:11 +0000)
commitf51350007951c5ac5f442c8a43d6ae6bf6a8196c
treea962dd38e618d42c24a9e5af7cae8be0274bc883
parentb9397f8c5a852219a56609aad394b2f7be31a40d
parentb75accf8792fc85be4f59bd073c2a991c1b27f41
resolve index.html conflict
public/index.html