自动文章合并|自动图片压缩

f14ab7d6 · 吕祺 · b2c4da92 · f14ab7d6
Commit f14ab7d6 authored Mar 04, 2024 by 吕祺 ⛹🏽
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

newsList.md content/newsList.md +4 -0

No files found.
--- a/content/newsList.md
+++ b/content/newsList.md
 ---
 news:
 - title: test
+<<<<<<< Updated upstream
  titleEN: '333'
+=======
+  titleEN: 333r
+>>>>>>> Stashed changes
  hide: false
  createDate: 2024-03-01T08:42:59.862Z
  abstract: test