Merge pull request #325 from CodeYourFuture/kfklein15-patch-5

Update Js2 S2 Day PD.md
CodeYourFuture · Oct 17, 2023 · 8845b92 · 8845b92
2 parents 028b62e + e539903
commit 8845b92
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/content/js2/sprints/2/day-plan/index.md b/content/js2/sprints/2/day-plan/index.md
@@ -4,6 +4,9 @@ layout = 'day-plan'
 emoji= '📝'
 menu_level = ['sprint']
 weight = 3
+[[blocks]]
+name="Conflict Resolution"
+src="https://cyf-pd.netlify.app/blocks/conflict-resolution/readme/"
 backlog= 'Module-JS2'
 backlog_filter= 'Week 2'
 +++