post rebase comment addition

mozilla-services · Jan 30, 2024 · 5aed9e3 · 5aed9e3
1 parent df462ed
commit 5aed9e3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/tests/integration/test_integration_all_rust.py b/tests/integration/test_integration_all_rust.py
@@ -480,12 +480,8 @@ def _get_vapid(
 
 
 def enqueue_output(out, queue):
-<<<<<<< HEAD
-    for line in iter(out.readline, ""):
-=======
     """Add lines from the out buffer to the provided queue."""
-    for line in iter(out.readline, b""):
->>>>>>> f775454 (review comments for clearer test functions)
+    for line in iter(out.readline, ""):
         queue.put(line)
     out.close()