resolve conflicts on merge

This commit is contained in:
Sam Hatchett
2019-12-11 14:20:25 -05:00

View File

@@ -292,6 +292,7 @@ Doxygen files have been created to generate a complete Users Guide for version 2
(In alphabetical order) (In alphabetical order)
- Demetrios Eliades - Demetrios Eliades
- Sam Hatchett - Sam Hatchett
- Abel Heinsbroek
- Marios Kyriakou - Marios Kyriakou
- Lewis Rossman - Lewis Rossman
- Elad Salomons - Elad Salomons