From c026be7da36611eaf817ecec593dac0dd090ff0a Mon Sep 17 00:00:00 2001 From: "yuhang.li" Date: Tue, 13 Aug 2013 15:39:29 +0800 Subject: [PATCH] Revert "Merged pull request #9." This reverts commit bdd3996d38d885e18e5c5960df1c2c06e34d673f, reversing changes made to fd0a1b26db73410692acdd21e36a3ea58e6fe4b5. --- index.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index fc8f5f12d091..f374eca889ab 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,14 @@ - + +<<<<<<< HEAD + untitled +======= Untitled +>>>>>>> parent of bdd3996... Merged pull request #9.