From dd61153c3d3e33b91871cb4171171ed5487067f5 Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@frogmouth.net>
Date: Sat, 23 Aug 2025 14:14:14 +1000
Subject: [PATCH] clean up merge conflict

---
 src/pytak/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pytak/__init__.py b/src/pytak/__init__.py
index c57c77f..ac99d50 100644
--- a/src/pytak/__init__.py
+++ b/src/pytak/__init__.py
@@ -46,12 +46,8 @@
     DEFAULT_COT_VAL,
     DEFAULT_MAX_OUT_QUEUE,
     DEFAULT_MAX_IN_QUEUE,
-<<<<<<< Updated upstream
-    ISO_8601_UTC,
-    DEFAULT_TLS_ENROLLMENT_CERT_PASSPHRASE_LENGTH
-=======
+    DEFAULT_TLS_ENROLLMENT_CERT_PASSPHRASE_LENGTH,
     ISO_8601_UTC
->>>>>>> Stashed changes
 )
 
 from .classes import (  # NOQA