Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated custom words to resolve merge conflict #20833

Merged
merged 2 commits into from
Sep 23, 2022
Merged

Updated custom words to resolve merge conflict #20833

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f65e85e
Updated custom words to resolve merge conflict
Sep 22, 2022
b10d20d
Updated custom words to resolve merge conflict
Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ aapl
AATP
abcxyz
ABFS
Abstractive
ABGRABGR
Accel
ACCELCONTAINER
Expand All @@ -22,6 +23,7 @@ ACLs
aclspec
acquisitionid
acrapi
ACSS
ACSSMS
actionplans
activedirectory
Expand All @@ -46,6 +48,7 @@ adultscore
afd
afdx
affinitized
AFRI
AFRINIC
agentpool
aggregatedcost
Expand Down Expand Up @@ -175,6 +178,7 @@ authprovider
authproviders
Auths
authsettings
authtoken
authsid
autobackup
Autocompletes
Expand Down Expand Up @@ -416,6 +420,7 @@ Coffeelake
cognitiveservices
colls
colocation
Cololocation
COLUMNSTORE
commandshistory
commitmentplans
Expand Down Expand Up @@ -598,14 +603,18 @@ deserializer
deserializing
destaging
destinationshares
detectorproperties
deterministically
devcenter
devcenters
devbox
devboxes
devboxdefinitions
deviceclass
deviceclasses
devicecredentials
devicegroups
deviceid
deviceids
deviceprovisioningservices
devicestates
Expand Down Expand Up @@ -727,6 +736,7 @@ Eventhub
eventhubconnections
eventhubs
eventroutes
eventstream
eventtime
eventtypes
EWDG
Expand Down Expand Up @@ -1130,6 +1140,7 @@ largefacelists
largepersongroups
lastfile
lastmodified
LATAM
Latn
l'avion
LDAP
Expand All @@ -1150,6 +1161,7 @@ Liftr
Linestring
linkedservices
linkexpiryinminutes
linkworkspaces
LISTAFTERID
listbackups
listbyrg
Expand Down Expand Up @@ -1231,8 +1243,11 @@ managementpartner
managementpolicy
manualupgrade
mapbox
mapconfiguration
mapconfigurations
mapred
mapreduce
Maputnik
mariadb
Marketo
marketplaceagreementsapi
Expand Down Expand Up @@ -1454,6 +1469,7 @@ numa
numofmessages
numrecords
nvarchar
NVME
Nynorsk
nysiis
OAEP
Expand Down Expand Up @@ -2124,6 +2140,7 @@ swedensouth
switchprotection
switzerlandnorth
switzerlandwest
synapselink
Sybase
Syncer
syncfunctiontriggers
Expand Down Expand Up @@ -2184,6 +2201,7 @@ Tful
Tfvc
tilejson
tileset
tilesetconfiguration
tilesets
timeasc
timedesc
Expand Down Expand Up @@ -2358,6 +2376,8 @@ virtualmachine
virtualmachineimagebuilder
virtualmachines
virtualnetworkgateways
virtualnetworkgatewaypolicygroups
vngclientconnectionconfigurations
virtualnetworkrules
virtualnetworks
Virtustream
Expand Down Expand Up @@ -2467,6 +2487,7 @@ workbooktemplates
Workernode
workitemsource
workloadmonitor
workspace
workspaces
workspace's
wrapkey
Expand Down Expand Up @@ -2654,6 +2675,8 @@ verifyx
removex
generateverificationcodex
favorited
datawarehousequeries
Dataware
SIMIDs
ICCID
unversioned
Expand Down Expand Up @@ -2706,4 +2729,21 @@ Skolt
Thangmi
Tuvan
Uyghur
occured
Occured
Paramter
Spza
metallb
kubevirt
vmip
xlargerc
largerc
mediumrc
smallrc
Autotune
Showmount
autogrid
KubeProxyConfig
IPVS
TCPFIN
taginheritance