Fix merge conflict

project-chip · Nov 8, 2023 · b682e0d · b682e0d
1 parent e6871e0
commit b682e0d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test_collections/sdk_tests/__init__.py b/test_collections/sdk_tests/__init__.py
@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-<<<<<<< HEAD
 from .support.yaml_tests import sdk_collection, custom_collection
 # TODO The Python test support implementation is ongoing.
 # Uncomment line below when the implementation is done. 
 #from .support.python_testing import sdk_python_collection
-=======
-from .support.yaml_tests import custom_collection, sdk_collection
->>>>>>> main