Skip to content

Commit

Permalink
Remove a stray conflict resolution marker in RUNNING_TESTS.md
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Sep 23, 2023
1 parent 976c0f4 commit fb64c5f
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions RUNNING_TESTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ Tests run: 121, Failures: 0, Errors: 0, Skipped: 0

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

<<<<<<< HEAD

## Running tests against an externally provided broker or cluster

By default, if the RabbitMQ broker sources are available, the testsuite
Expand Down

0 comments on commit fb64c5f

Please sign in to comment.