feat: commit

Author: zs1nsk1

_config.yml

@@ -8,13 +8,8 @@ theme: jekyll-theme-chirpy
 # otherwise, the layout language will use the default value of 'en'.
 lang: en
 
-<<<<<<< HEAD
 # Change to your timezone › https://zones.arilyn.cc
 timezone: Asia/Shanghai
-=======
-# Change to your timezone › https://kevinnovak.github.io/Time-Zone-Picker
-timezone:
->>>>>>> e0f0082 (feat: primer commit)
 
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------