Resolve merge conflict

This commit is contained in:
John Jardine 2019-10-19 22:46:17 -04:00 committed by GitHub
parent c10aa80c95
commit 05e1b9f955
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23

@ -69,10 +69,6 @@ The list should be structured in the following way:
- Mount for Humidity/Temperature sensor. - Mount for Humidity/Temperature sensor.
[Load Cell Spool Holder](https://github.com/VoronDesign/Voron-2/tree/master/Mods/Danowar/Load_Cell_Spool_Holder)
- Spool holder with built in weight scale.
[Load Cell Spool Holder](../mods/Danowar/Load_Cell_Spool_Holder) [Load Cell Spool Holder](../mods/Danowar/Load_Cell_Spool_Holder)
- Spool holder with built in weight scale. - Spool holder with built in weight scale.