Skip to content

Commit b87444f

Browse files
committed
Merge remote-tracking branch 'origin/master' into release/v6
2 parents 4d936d2 + e276347 commit b87444f

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

Common/UnitDefinitions/Length.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
"Localization": [
180180
{
181181
"Culture": "en-US",
182-
"Abbreviations": [ "NM" ]
182+
"Abbreviations": [ "NM", "nmi" ]
183183
},
184184
{
185185
"Culture": "ru-RU",

Common/UnitDefinitions/Turbidity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"Localization": [
1313
{
1414
"Culture": "en-US",
15-
"Abbreviations": ["NTU"]
15+
"Abbreviations": [ "NTU" ]
1616
}
1717
]
1818
}

UnitsNet.Tests/GeneratedCode/TestsBase/LengthTestsBase.g.cs

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet/GeneratedCode/Resources/Length.restext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Mils=mil
3030
Miles=mi
3131
Millimeters=mm
3232
Nanometers=nm
33-
NauticalMiles=NM
33+
NauticalMiles=NM,nmi
3434
Parsecs=pc
3535
Picometers=pm
3636
PrinterPicas=pica

0 commit comments

Comments
 (0)