Updating tests

testing/check_xsd.py

@@ -120,19 +120,11 @@ if __name__ == '__main__':
                 logging.info(f">Including instance doc {g}")
                 includeInstanceDocList.append(g)
         else:
-<<<<<<< HEAD
             logging.info(f">Including {p.absolute()}")
             if str(p.absolute()).endswith('.xml'):
                 includeInstanceDocList.append(str(p.absolute()))
             elif str(p.absolute()).endswith('.xsd'):
                 includeFileList.append(str(p.absolute()))
-=======
-            logging.info(f"Including {p.absolute()}")
-            if str(p.absolute()).endswith('.xml'):
-                includeInstanceDocList.append(p.absolute())
-            elif str(p.absolute()).endswith('.xml'):
-                includeFileList.append(p.absolute())
->>>>>>> f3f09f7c3888b660d639f273b2164823ac0460cc
             else:
                 logging.warning(f'Ignoring file {p.absolute()}')
     
@@ -193,4 +185,3 @@ if __name__ == '__main__':
             print (f"  {instanceDoc} : {str(ex)}")
     print (f"{errorCount} instance doc errors detected")
     exit(errorCount)
-