From: ec2-user Date: Sun, 20 Nov 2011 03:44:44 +0000 (+0000) Subject: resolved index.html conflict in head X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5365ef7a9ee87478ac28e7e32ed506f3dbfabdbe;p=oweals%2Ffinalsclub.git resolved index.html conflict in head --- 5365ef7a9ee87478ac28e7e32ed506f3dbfabdbe diff --cc public/index.html index 60cdacb,fe78b53..e6a2e71 --- a/public/index.html +++ b/public/index.html @@@ -3,9 -3,11 +3,12 @@@ - - - + + + ++ + +