update

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