Skip to content

F
ficus
Commit ba827cd5 authored by 吕祺's avatar 吕祺 ⛹🏽
Browse files
Options

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

parent f14ab7d6
Pipeline #4800 failed with stage
    in 25 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 4 additions and 0 deletions
    content/newsList.md
    View file @ ba827cd5
    --- ---
    news: news:
    - title: test - title: test
    <<<<<<< Updated upstream
    <<<<<<< Updated upstream <<<<<<< Updated upstream
    titleEN: '333' titleEN: '333'
    =======
    titleEN: 333r
    >>>>>>> Stashed changes
    ======= =======
    titleEN: 333r titleEN: 333r
    >>>>>>> Stashed changes >>>>>>> Stashed changes
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment