diff --git a/pmcalendar.php b/pmcalendar.php
index c516fd5..7e022a7 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -982,15 +982,25 @@ if ($act == 'newevent') {
 
     function gamesbtndis(){
         var type = $("#gamesbtn").css('display');
-        // console.log($("#xsqb font font").html());
+<<<<<<< HEAD
+        // console.log($("#xsqb").html());
         if(type == 'none'){
             $("#gamesbtn").show();
-            $("#xsqb font font").html('收回');
+            $("#xsqb").html('收回');
             $("#left_box").hide();
         }else {
             $("#gamesbtn").hide();
-            $("#xsqb font font").html('显示全部');
+            $("#xsqb").html('显示全部');
             $("#left_box").show();
+=======
+        // console.log($("#xsqb").html());
+        if(type == 'none'){
+            $("#gamesbtn").show();
+            $("#xsqb").html('收回');
+        }else {
+            $("#gamesbtn").hide();
+            $("#xsqb").html('展开');
+>>>>>>> febe866db30128c12105b45b4afa618b410d6a22
         }
     }