From 7d4c1a2481fa1ffd05e8c64e6e2e8aa341bda895 Mon Sep 17 00:00:00 2001
From: wpbonelli <wbonelli@ucar.edu>
Date: Wed, 16 Oct 2024 14:05:15 -0400
Subject: [PATCH] hints

---
 autotest/test_generate_classes.py | 7 -------
 flopy/mf6/utils/codegen/dfn.py    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/autotest/test_generate_classes.py b/autotest/test_generate_classes.py
index 67cb6900c..8e5962f41 100644
--- a/autotest/test_generate_classes.py
+++ b/autotest/test_generate_classes.py
@@ -1,10 +1,7 @@
 import sys
 from os import environ
 from pathlib import Path
-<<<<<<< HEAD
 from platform import system
-=======
->>>>>>> 5cf4ed2a (restore test_generate_classes.py)
 from pprint import pprint
 from typing import Iterable
 from warnings import warn
@@ -34,10 +31,6 @@ def pytest_generate_tests(metafunc):
     against all of the versions of mf6io flopy guarantees
     support for- maybe develop and latest release? Though
     some backwards compatibility seems ideal if possible.
-<<<<<<< HEAD
-=======
-    This would need changes in GH Actions CI test matrix.
->>>>>>> 5cf4ed2a (restore test_generate_classes.py)
     """
 
     owner = "MODFLOW-USGS"
diff --git a/flopy/mf6/utils/codegen/dfn.py b/flopy/mf6/utils/codegen/dfn.py
index cbf527e84..f6d7c66e0 100644
--- a/flopy/mf6/utils/codegen/dfn.py
+++ b/flopy/mf6/utils/codegen/dfn.py
@@ -29,7 +29,7 @@
 Dfns = Dict[str, "Dfn"]
 
 
-def _try_parse_bool(value):
+def _try_parse_bool(value: Any) -> Any:
     """
     Try to parse a boolean from a string as represented
     in a DFN file, otherwise return the value unaltered.