Update TNM version after release

Azure · Apr 28, 2021 · cc39b55 · cc39b55
1 parent ab2971d
commit cc39b55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/sdk/communication/Azure.Communication.PhoneNumbers/CHANGELOG.md b/sdk/communication/Azure.Communication.PhoneNumbers/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Release History
 
+<<<<<<< HEAD
 ## 1.1.0-beta.1 (Unreleased)
 
+=======
+## 1.0.1 (Unreleased)
+>>>>>>> ca3b22f4e3... Update TNM version after release
 
 ## 1.0.0 (2021-04-26)
 Updated `Azure.Communication.PhoneNumbers` version.

diff --git a/...ommunication/Azure.Communication.PhoneNumbers/src/Azure.Communication.PhoneNumbers.csproj b/...ommunication/Azure.Communication.PhoneNumbers/src/Azure.Communication.PhoneNumbers.csproj
@@ -5,7 +5,11 @@
       For this release, see notes - https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/communication/Azure.Communication.PhoneNumbers/README.md and https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/communication/Azure.Communication.PhoneNumbers/CHANGELOG.md.
     </Description>
     <AssemblyTitle>Azure Communication Phone Numbers Service</AssemblyTitle>
+<<<<<<< HEAD
     <Version>1.1.0-beta.1</Version>
+=======
+    <Version>1.0.1</Version>
+>>>>>>> ca3b22f4e3... Update TNM version after release
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
     <ApiCompatVersion>1.0.0</ApiCompatVersion>
     <PackageTags>Microsoft Azure Communication Phone Numbers Service;Microsoft;Azure;Azure Communication Service;Azure Communication Phone Numbers Service;Phone Numbers;Communication;$(PackageCommonTags)</PackageTags>