From f65e85e0444e56587e75349d4901d80b3e02668a Mon Sep 17 00:00:00 2001 From: maulikjoshi Date: Thu, 22 Sep 2022 11:34:36 -0700 Subject: [PATCH 1/2] Updated custom words to resolve merge conflict --- custom-words.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index cee58f78ef60..85a17b29b9d0 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -9,6 +9,7 @@ aapl AATP abcxyz ABFS +Abstractive ABGRABGR Accel ACCELCONTAINER @@ -22,6 +23,7 @@ ACLs aclspec acquisitionid acrapi +ACSS ACSSMS actionplans activedirectory @@ -46,6 +48,7 @@ adultscore afd afdx affinitized +AFRI AFRINIC agentpool aggregatedcost @@ -175,6 +178,7 @@ authprovider authproviders Auths authsettings +authtoken authsid autobackup Autocompletes @@ -416,6 +420,7 @@ Coffeelake cognitiveservices colls colocation +Cololocation COLUMNSTORE commandshistory commitmentplans @@ -598,14 +603,18 @@ deserializer deserializing destaging destinationshares +detectorproperties deterministically devcenter devcenters +devbox +devboxes devboxdefinitions deviceclass deviceclasses devicecredentials devicegroups +deviceid deviceids deviceprovisioningservices devicestates @@ -727,6 +736,7 @@ Eventhub eventhubconnections eventhubs eventroutes +eventstream eventtime eventtypes EWDG @@ -1130,6 +1140,7 @@ largefacelists largepersongroups lastfile lastmodified +LATAM Latn l'avion LDAP @@ -1150,6 +1161,7 @@ Liftr Linestring linkedservices linkexpiryinminutes +linkworkspaces LISTAFTERID listbackups listbyrg @@ -1231,8 +1243,11 @@ managementpartner managementpolicy manualupgrade mapbox +mapconfiguration +mapconfigurations mapred mapreduce +Maputnik mariadb Marketo marketplaceagreementsapi @@ -1454,6 +1469,7 @@ numa numofmessages numrecords nvarchar +NVME Nynorsk nysiis OAEP @@ -2124,6 +2140,7 @@ swedensouth switchprotection switzerlandnorth switzerlandwest +synapselink Sybase Syncer syncfunctiontriggers @@ -2184,6 +2201,7 @@ Tful Tfvc tilejson tileset +tilesetconfiguration tilesets timeasc timedesc @@ -2358,6 +2376,8 @@ virtualmachine virtualmachineimagebuilder virtualmachines virtualnetworkgateways +virtualnetworkgatewaypolicygroups +vngclientconnectionconfigurations virtualnetworkrules virtualnetworks Virtustream @@ -2467,6 +2487,7 @@ workbooktemplates Workernode workitemsource workloadmonitor +workspace workspaces workspace's wrapkey @@ -2654,6 +2675,8 @@ verifyx removex generateverificationcodex favorited +datawarehousequeries +Dataware SIMIDs ICCID unversioned @@ -2706,4 +2729,22 @@ Skolt Thangmi Tuvan Uyghur +occured +Occured Paramter +Spza +metallb +kubevirt +vmip +xlargerc +largerc +mediumrc +smallrc +Autotune +Showmount +autogrid +KubeProxyConfig +IPVS +TCPFIN +taginheritance +Paramter \ No newline at end of file From b10d20de4567277c771498a6d7b2e5f152414192 Mon Sep 17 00:00:00 2001 From: maulikjoshi Date: Thu, 22 Sep 2022 11:36:54 -0700 Subject: [PATCH 2/2] Updated custom words to resolve merge conflict --- custom-words.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index 85a17b29b9d0..55327dbbda6a 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2746,5 +2746,4 @@ autogrid KubeProxyConfig IPVS TCPFIN -taginheritance -Paramter \ No newline at end of file +taginheritance \ No newline at end of file