Merge conflicts solve

4 years ago · 8732101938
parent 6c2b12d7bf
commit 8732101938
1 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -92,4 +92,4 @@ Verq (Verq#2338) - https://github.com/CordlessCoder
 LukaHietala (Pix.#0001) - https://github.com/LukaHietala
-Freebiell (Freebie#3263) - https://github.com/FreebieII
+Freebiell (Freebie#6429) - https://github.com/FreebieII
`@ -92,4 +92,4 @@ Verq (Verq#2338) - https://github.com/CordlessCoder`

	`LukaHietala (Pix.#0001) - https://github.com/LukaHietala`	`LukaHietala (Pix.#0001) - https://github.com/LukaHietala`

	`Freebiell (Freebie#3263) - https://github.com/FreebieII`	`Freebiell (Freebie#6429) - https://github.com/FreebieII`