Skip to content

Commit fb64c5f

Browse files
Remove a stray conflict resolution marker in RUNNING_TESTS.md
1 parent 976c0f4 commit fb64c5f

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

RUNNING_TESTS.md

-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ Tests run: 121, Failures: 0, Errors: 0, Skipped: 0
166166

167167
Test reports can be found in `target/failsafe-reports`.
168168

169-
<<<<<<< HEAD
170-
171169
## Running tests against an externally provided broker or cluster
172170

173171
By default, if the RabbitMQ broker sources are available, the testsuite

0 commit comments

Comments
 (0)