chore: fix some merge conflicts

Jarmos-san · Nov 20, 2023 · bfcd2b6 · bfcd2b6
2 parents 9e28bf8 + 5bf2ac4
commit bfcd2b6
Show file tree

Hide file tree

Showing 22 changed files with 2,375 additions and 3,821 deletions.
diff --git a/_blog/a-standard-ci-cd-pipeline-for-python-projects.md b/_blog/a-standard-ci-cd-pipeline-for-python-projects.md