update

2020-12-08 17:16:42 +08:00 · 2020-12-08 17:16:42 +08:00 · ed730cc827
commit ed730cc827
parent b6a6d516e1
1 changed files with 0 additions and 4 deletions
--- a/pmcalendar.php
+++ b/pmcalendar.php
@ -1404,11 +1404,7 @@ if ($act == 'newevent') {
                            axisLabel:{
                                show: true,
                                textStyle:{
-<<<<<<< HEAD
                                    color:"#969696"
-=======
-                                    color:"#bfbfbf"
->>>>>>> 2c187a10dc1a85dccde8edefa5131586357f8f3f
                                }
                            },
                            axisLine:{