conftest.py

Author: GMS103

conftest.py

@@ -198,6 +198,13 @@ def pytest_collect_file(
                 # This is an executable file.
                 return IgnoreCollector.from_parent(parent)
 
+<<<<<<< HEAD
+=======
+            if file_path.name == "conftest_inputtest.py":
+                # This is an input file for testing the doctest machinery (and contains broken doctests).
+                return IgnoreCollector.from_parent(parent)
+
+>>>>>>> 96245a0e185 (conftest.py)
             if (
                 (
                     file_path.name == "finite_dimensional_lie_algebras_with_basis.py"