delete medium theme

2015-01-08 23:27:13 +08:00
parent ddf3236c4f
commit 52d0a7ed21
27 changed files with 125 additions and 1553 deletions
--- a/public/js/common.js
+++ b/public/js/common.js
@ -809,10 +809,7 @@ function setCookie(c_name, value, expiredays){
 	document.cookie = c_name+ "=" + escape(value) + ((expiredays==null) ? "" : ";expires="+exdate.toGMTString());
 }
 function logout() {
-<<<<<<< HEAD
-=======
 	setCookie("LEANOTE_SESSION", '', -1);
->>>>>>> dev-life
 	location.href = UrlPrefix + "/logout?id=1";
 }