maybe we won't need a separate conflict episode

coderefinery · Mar 7, 2024 · bab5d47 · bab5d47
1 parent ccc0999
commit bab5d47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/content/conflict-resolution.md b/content/conflict-resolution.md
diff --git a/content/index.md b/content/index.md
@@ -50,7 +50,6 @@ motivation
 browsing
 commits
 merging
-conflict-resolution
 local-workflow
 ```
 
@@ -78,7 +77,7 @@ what-to-avoid
 
 ```{toctree}
 :maxdepth: 1
-:caption: Previous episodes (WIP)
+:caption: Older episodes
 
 basics
 branches