resolved index.html conflict in head
authorec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)
committerec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)
commit5365ef7a9ee87478ac28e7e32ed506f3dbfabdbe
tree8a3ace8828b32fb1c0147b19d454b929fc071e01
parentd315a33600642d220d64759f8d3909b8a1a8ef3c
parent65b5f911001fa4d780a0a9295bf1ce8712aea0ee
resolved index.html conflict in head
public/index.html
public/javascripts/main.js