resolve conflicts on merge

LRossman · Dec 11, 2019 · 588a9da · 588a9da
2 parents 4d8d82d + 77243b1
commit 588a9da
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ReleaseNotes2_2.md b/ReleaseNotes2_2.md
@@ -292,6 +292,7 @@ Doxygen files have been created to generate a complete Users Guide for version 2
 (In alphabetical order)
  - Demetrios Eliades
  - Sam Hatchett
+ - Abel Heinsbroek
  - Marios Kyriakou
  - Lewis Rossman
  - Elad Salomons