From 3c98f5ed6a1ec905b8a007a1f340b9710460a433 Mon Sep 17 00:00:00 2001 From: Kor Dwarshuis Date: Fri, 17 Jan 2025 09:28:30 +0100 Subject: [PATCH] Unresolved merge conflict markers create illegal characters (`<`) --- docs/general/add-content/migration.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/general/add-content/migration.md b/docs/general/add-content/migration.md index ea2a71d4..a4aec66e 100644 --- a/docs/general/add-content/migration.md +++ b/docs/general/add-content/migration.md @@ -160,11 +160,7 @@ During the process, you can ignore the NPM warnings. Keeping up-to-date with warnings would demand a daily effort from programmers and maintainers. Things change so quickly but are hardly ever a breaking change. ::: -<<<<<<< HEAD -:::tip Optional extra check -======= :::todo Optional extra check ->>>>>>> upstream/main Do the extra check with the "NPM list" command to see whether your install or update command has worked as expected. Check the packages and their latest version numbers. :::