Docs: Add Francis Irving to contributors as author of original conflict file parser...

diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
index fbb86d6..f43720c 100644 (file)
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -143,6 +143,7 @@ WinMerge includes code from:
 * Brent Corkum (BCMenu)
 * Paul DiLascia (CStaticLink) 
 * Michael Dunn (CShellFileOp)
+* Francis Irving (original conflict file parser)
 * Michael P. Mehl (CMessageBoxDialog)
 * Cristi Posea (CSizingControlBar)
 * Ferdinand Prantl (CrystalEditor syntax rules)