From: ec2-user Date: Sun, 20 Nov 2011 03:47:09 +0000 (+0000) Subject: resolve conflict X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce08c99cd275f3e3aa5015145473903c76bb45b3;p=oweals%2Ffinalsclub.git resolve conflict --- ce08c99cd275f3e3aa5015145473903c76bb45b3 diff --cc public/index.html index fe7412e,5b0fc34..d2e1883 mode 100644,100755..100755 --- a/public/index.html +++ b/public/index.html @@@ -17,43 -18,103 +18,106 @@@ - -
-
-
-
-
- - - - - -
- - - Start Here! - Blog - Archive - Press - Create an Account - - Login -
+
+
+
+ +
+
+ + + +
-
 
- +
+
__msg__
+
+
+
+
__msg__
+
-
+ +