Skip to content

Commit 3294f2e

Browse files
MarcialRosalesmergify[bot]
authored andcommitted
Fix test case name
Fix test case nam# Por favor ingresa el mensaje del commit para tus cambios. Las (cherry picked from commit aeda3ca) # Conflicts: # deps/rabbitmq_mqtt/test/auth_SUITE.erl
1 parent cb3181c commit 3294f2e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

deps/rabbitmq_mqtt/test/auth_SUITE.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@ sub_groups() ->
6969
ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
7070
]},
7171
{ssl_user_with_invalid_client_id_in_cert_san_dns, [],
72+
<<<<<<< HEAD
7273
<<<<<<< HEAD
7374
[invalid_client_id_from_cert_san_dns
7475
]},
7576
{ssl_user_with_client_id_in_cert_san_dns, [],
7677
[client_id_from_cert_san_dns
7778
=======
7879
[client_id_from_cert_san_dns
80+
=======
81+
[invalid_client_id_from_cert_san_dns
82+
>>>>>>> aeda3cada (Fix test case name)
7983
]},
8084
{ssl_user_with_client_id_in_cert_san_dns, [],
8185
[client_id_from_cert_san_dns

0 commit comments

Comments
 (0)