Merge pull request #324 from CodeYourFuture/kfklein15-patch-4

Update JS2 S2 Prep PD.md
CodeYourFuture · Oct 17, 2023 · 4a4b1b6 · 4a4b1b6
2 parents 8845b92 + c1f7dd4
commit 4a4b1b6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/content/js2/sprints/2/prep/index.md b/content/js2/sprints/2/prep/index.md
@@ -30,4 +30,7 @@ name="Variable keys"
 [[blocks]]
 src="js2/blocks/multiple-params"
 name="Multiple params"
+[[blocks]]
+src="https://cyf-pd.netlify.app/blocks/prep-conflict-resolution/readme/"
+name="Conflict Resolution"
 +++