fix: Correct typo in resolve-merge-conflicts.md (open-sauced#128)

Fix: Correct typo in resolve-merge-conflicts.md
Lymah123 · Aug 12, 2023 · 72f3b45 · 72f3b45
1 parent a023fc1
commit 72f3b45
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/technical/resolve-merge-conflicts.md b/docs/technical/resolve-merge-conflicts.md
@@ -6,7 +6,7 @@ keywords:
   - Resolve merge conflicts
 ---
 
-Pretty often when opening a pull request it is very likely to run into merge conflicts as the release process is generally updating `npm-shriknwrap.json`.
+Pretty often when opening a pull request it is very likely to run into merge conflicts as the release process is generally updating `npm-shrinkwrap.json`.
 
 To better illustrate the commands listed here at will use commits and screenshots from [open-sauced#1078](https://github.com/open-sauced/open-sauced/pull/1078).