Fix major merge conflicts in thanks file

Unfortunately the renaming of the thanks-for-fixes.md to
thanks-for-help.md along with other changes with the it caused massive
merge conflicts. The file was out of order, there were a lot of >>>
lines etc.

I had to checkout the old file and update it for the changes I made this
morning. Unfortunately this does mean that the <a ..> anchors are no
longer there, relying on markdown to do that instead. That will have to
be fixed but I also noticed an error in that too. I am not sure if
that's because of the merge conflict or not though.

I will have to check that I got everything in order but I think I did as
I also added what I had added to it today.
This commit is contained in:
Cody Boone Ferguson committed 2023-12-08 09:00:10 -08:00
1 parent 2ae2e85cd0
commit 8d2e20773b
1 file changed
+517 -550
+517 -550
View File
File diff suppressed because it is too large. Load diff