Resolving merge conflict

6a33275b · canterburym · c46cabd6 · 6a33275b
Commit 6a33275b authored Oct 22, 2021 by canterburym
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

testing/check_xsd.py testing/check_xsd.py +0 -1

No files found.
--- a/testing/check_xsd.py
+++ b/testing/check_xsd.py
@@ -186,4 +186,3 @@ if __name__ == '__main__':
    print (f"{errorCount} instance doc errors detected")
    exit(errorCount)

-