merge

.github/workflows/gh-pages.yml

@@ -75,7 +75,6 @@ jobs:
       - uses: pnpm/action-setup@v2
         name: Install pnpm
         with:
-<<<<<<< HEAD
           # Git branch where site will be deployed
           target_branch: gh-pages
           # Create incremental commit instead of doing push force
@@ -88,7 +87,6 @@ jobs:
           jekyll: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-=======
           version: 8
           run_install: false
 
@@ -118,4 +116,3 @@ jobs:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v1
->>>>>>> e088d5585bc7f7d1bca99b7dd9734fc78d56ef3c

.github/workflows/run_data_sync.yml

@@ -34,13 +34,10 @@ env:
   # Dont making this huge, just picking points you needing. https://developers.google.com/maps/documentation/utilities/polylineutility using this tool to making your polyline
   IGNORE_POLYLINE: 'ktjrFoemeU~IorGq}DeB'
   IGNORE_RANGE: 10 # Unit meter
-<<<<<<< HEAD
   SAVE_DATA_IN_GITHUB_CACHE: true # if you deploy in the vercal, check the README
   DATA_CACHE_PREFIX: "track_data"
-=======
   SAVE_DATA_IN_GITHUB_CACHE: false # if you deploy in the vercal, check the README
   DATA_CACHE_PREFIX: 'track_data'
->>>>>>> e088d5585bc7f7d1bca99b7dd9734fc78d56ef3c
   BUILD_GH_PAGES: true # If you do not need GitHub Page please set it to `false`
 
 jobs:

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ## 点击[我的跑步主页](https://s1smart.github.io/running_page)
 
  欢迎来到我的跑步主页，这是一个基于@yihong0618 优秀的开源项目：[running page](https://github.com/yihong0618/running_page) 构建的小项目。   
@@ -9,15 +8,15 @@
 ## 以下引用：
 
 ## 注：如果是之前 clone 或 Fork 的朋友 vercel 显示 404 可能需要更新下代码
-=======
+
 ## note1: clone or Fork before vercel 404 need to pull the latest code
 
 ## note2: python3(python) in README means python3 python
 
 ## note3: use v2.0 need change vercel setting from gatsby to vite.
 
 ## note4: 2023.09.26 garmin need secret_string(and in Actions) get `python run_page/garmin_sync.py ${email} ${password}` if cn `python run_page/garmin_sync.py ${email} ${password} --is-cn`
->>>>>>> e088d5585bc7f7d1bca99b7dd9734fc78d56ef3c
+
 
 <p align="center">
   <img width="150" src="https://raw.githubusercontent.com/shaonianche/gallery/master/running_page/running_page_logo.png" />