Merge pull request #10167 from jbccollins/Fix-Unresolved-Merge-Conflict

Fix Unresolved Merge Conflict
DestinyItemManager · Dec 11, 2023 · 057fd92 · 057fd92
2 parents 525ad86 + 1b1fd93
commit 057fd92
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/docs/Docker.md b/docs/Docker.md
@@ -66,19 +66,15 @@ apt-get install nano
 
 
 
-<<<<<<< HEAD
-If you need to install new node dependencies, you should run those commands from inside the container. Once inside, use `pnpm add NameOfTheDependency` as normal.
-=======
 ## Installing new packages
 If you need to install new node dependencies, you should run those commands from inside the container via:
 ```sh
 docker-compose exec webpack bash
 ```
 
-Once inside, use `yarn add NameOfTheDependency` as normal.
+Once inside, use `pnpm add NameOfTheDependency` as normal.
 
 
->>>>>>> origin/master
 
 ## Container terminates unexpectedly
 On Windows, you may see the error: