diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-08 10:31:06 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-08 10:31:06 -0500 |
| commit | b80d16bfd2dca34733e5cb37283df93d10805512 (patch) | |
| tree | dc90cf748a4d754e56ca16845e4b4358dd9bd931 /src/main/resources/unitsfile.txt | |
| parent | 768468b303627c215046cd10cf9e8ba62151ac65 (diff) | |
| parent | eba6fb3778b07b10ee321310991d375202f4c9d2 (diff) | |
Merge branch 'feature-search-settings' into develop
Diffstat (limited to 'src/main/resources/unitsfile.txt')
| -rw-r--r-- | src/main/resources/unitsfile.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/resources/unitsfile.txt b/src/main/resources/unitsfile.txt index 340e8ea..543c821 100644 --- a/src/main/resources/unitsfile.txt +++ b/src/main/resources/unitsfile.txt @@ -253,22 +253,21 @@ Wh W h # Extra units to show in the dimension-based converter km km -kilometre km cm cm centimetre cm mm mm -millimetre mm mg mg -milligram mg mL mL ml ml -millilitre mL -kJ kJ -kilojoule kJ MJ MJ megajoule MJ kWh kWh m/s m / s +metre/second m/s km/h km / h +kilometre/hour km/h ft/s foot / s -mi/h mile / hour
\ No newline at end of file +foot/second ft/s +mi/h mile / hour +mph mile / hour +mile/hour mi/h
\ No newline at end of file |