Skip to content

Commit 36d5fd8

Browse files
committed
Fix merge conflicts with master
2 parents 435f52d + 8f3fc71 commit 36d5fd8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/test_client_sync.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ def testUdpClientRepr(self):
156156
client.host, client.port, client.timeout
157157
)
158158
self.assertEqual(repr(client), rep)
159+
160+
159161
# -----------------------------------------------------------------------#
160162
# Test TCP Client
161163
# -----------------------------------------------------------------------#
@@ -234,7 +236,6 @@ def testSerialClientRpr(self):
234236
client.host, client.port, client.timeout
235237
)
236238
self.assertEqual(repr(client), rep)
237-
238239
# -----------------------------------------------------------------------#
239240
# Test Serial Client
240241
# -----------------------------------------------------------------------#

0 commit comments

Comments
 (0)