Skip to content

Commit 19f5928

Browse files
MarcialRosalesmichaelklishin
authored andcommitted
Remove duplicate lines
Conflicts: docs/oauth2-examples-entra-id/index.md
1 parent b143aef commit 19f5928

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

docs/oauth2-examples-entra-id/index.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,16 @@ limitations under the License.
2424
This guide explains how to set up OAuth 2.0 for RabbitMQ
2525
and Microsoft Entra ID as Authorization Server using the following flows:
2626

27+
<<<<<<< HEAD
2728
* Access the management UI via a browser using Entra ID (API version 2.0)
29+
||||||| parent of d7aec1c6 (Remove duplicate lines)
30+
<<<<<<< HEAD
31+
* Access the management UI via a browser using v2.0 api version
32+
=======
33+
* Access the management UI via a browser using v2.0 api version
34+
>>>>>>> d7aec1c6 (Remove duplicate lines)
2835
36+
<<<<<<< HEAD
2937
<<<<<<< HEAD
3038
||||||| parent of 7839e208 (Explain how to configure extra params for authorize and token endpoints)
3139
=======
@@ -38,6 +46,14 @@ and Microsoft Entra ID as Authorization Server using the following flows:
3846
>>>>>>> Explain how to configure extra params for authorize and token endpoints
3947
>>>>>>> 7839e208 (Explain how to configure extra params for authorize and token endpoints)
4048
49+
||||||| parent of d7aec1c6 (Remove duplicate lines)
50+
=======
51+
* Access the management UI via a browser using v2.0 api version
52+
53+
>>>>>>> Explain how to configure extra params for authorize and token endpoints
54+
55+
=======
56+
>>>>>>> d7aec1c6 (Remove duplicate lines)
4157
## Prerequisites to follow this guide
4258

4359
* Have an account in https://portal.azure.com.

0 commit comments

Comments
 (0)