📝 Sync upstream docs

2024-04-09 14:03:02 +01:00
parent 2e38a33fa7
commit 6fa782d6a8
2 changed files with 83 additions and 145 deletions
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -369,10 +369,6 @@ Usually, updating your system and packages will resolve the issue.

 See also: [#776](https://github.com/Lissy93/dashy/issues/776)

-<<<<<<< HEAD
-
-=======
->>>>>>> 51a9b4bfbe00600752bb04e7beba9a54a3a37912
 ---

 ## Error: Cannot find module './_baseValues'