Skip to content

Commit 5c42ae3

Browse files
committed
fix merge conflict
1 parent ca73f2f commit 5c42ae3

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

1-Authentication/1-sign-in-react/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here you'll learn how to [sign-in](https://docs.microsoft.com/azure/active-direc
6262
* [Node.js](https://nodejs.org/en/download/) must be installed to run this sample.
6363
* [Visual Studio Code](https://code.visualstudio.com/download) is recommended for running and editing this sample.
6464
* [VS Code Azure Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension is recommended for interacting with Azure through VS Code Interface.
65-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
65+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
6666
* A user account in your **external Microsoft Entra ID** tenant.
6767

6868
>This sample will not work with a **personal Microsoft account**. If you're signed in to the [Microsoft Entra admin center](https://entra.microsoft.com/) with a personal Microsoft account and have not created a user account in your directory before, you will need to create one before proceeding.

1-Authentication/3-sign-in-electron/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Here you'll learn how to sign-in users and acquire [ID tokens](https://docs.micr
6868
* [Visual Studio Code](https://code.visualstudio.com/download) is recommended for running and editing this sample.
6969
* [VS Code Azure Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension is recommended for interacting with Azure through VS Code Interface.
7070
* A modern web browser.
71-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
71+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
7272
* A user account in your **external Microsoft Entra ID** tenant.
7373

7474
>This sample will not work with a **personal Microsoft account**. If you're signed in to the [Microsoft Entra admin center](https://entra.microsoft.com/) with a personal Microsoft account and have not created a user account in your directory before, you will need to create one before proceeding.

1-Authentication/4-sign-in-device-code/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This sample demonstrates a Node headless application that authenticates users wi
5454

5555
## Prerequisites
5656

57-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
57+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
5858
* A user account in your **external Microsoft Entra ID** tenant.
5959

6060
>This sample will not work with a **personal Microsoft account**. If you're signed in to the [Microsoft Entra admin center](https://entra.microsoft.com/) with a personal Microsoft account and have not created a user account in your directory before, you will need to create one before proceeding.

1-Authentication/6-sign-in-node-cli-app/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Here you'll learn how to sign-in users and acquire [ID tokens](https://docs.micr
6161
* [Visual Studio Code](https://code.visualstudio.com/download) is recommended for running and editing this sample.
6262
* [VS Code Azure Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension is recommended for interacting with Azure through VS Code Interface.
6363
* A modern web browser.
64-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
64+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
6565
* A user account in your **external Microsoft Entra ID** tenant.
6666

6767
## Setup the sample

2-Authorization/0-call-api-vanillajs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Here you'll learn about [access tokens](https://docs.microsoft.com/azure/active-
7070
* [Visual Studio Code](https://code.visualstudio.com/download) is recommended for running and editing this sample.
7171
* [VS Code Azure Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension is recommended for interacting with Azure through VS Code Interface.
7272
* A modern web browser.
73-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
73+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
7474
* A user account in your **external Microsoft Entra ID** tenant.
7575

7676
## Setup the sample

2-Authorization/1-call-api-react/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Here you'll learn about [access tokens](https://docs.microsoft.com/azure/active-
6767
## Prerequisites
6868

6969
* Either [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/download) and [.NET Core SDK](https://www.microsoft.com/net/learn/get-started)
70-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
70+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
7171
* A user account in your **external Microsoft Entra ID** tenant.
7272

7373
## Setup the sample

2-Authorization/2-call-api-angular/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Here you'll learn about [access tokens](https://docs.microsoft.com/azure/active-
6969
## Prerequisites
7070

7171
* Either [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/download) and [.NET Core SDK](https://www.microsoft.com/net/learn/get-started)
72-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
72+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
7373
* A user account with permissions to create applications in your **external Microsoft Entra ID** tenant.
7474

7575
## Setup the sample

2-Authorization/3-call-api-node-daemon/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Here you'll learn about [access tokens](https://docs.microsoft.com/azure/active-
6767
## Prerequisites
6868

6969
* Either [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/download) and [.NET Core SDK](https://www.microsoft.com/net/learn/get-started)
70-
* An * An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
70+
* An **external Microsoft Entra ID** tenant. For more information, see: [Create a new tenant in Microsoft Entra ID](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant)
7171
* A user account in your **external Microsoft Entra ID** tenant.
7272

7373
## Setup the sample

0 commit comments

Comments
 (0)