diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-06-12 07:23:53 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-06-12 07:23:53 -0500 |
| commit | 716af8ab6c55961ce4171199b773005d22553571 (patch) | |
| tree | 00897ab85a26a73a5a46d75db6c5ca50122712da /src/main/resources/unitsfile.txt | |
| parent | 277500e27010839e03659870bc5890f1535aa8c8 (diff) | |
| parent | df3651baf72c799339268293fccb75e127bb336c (diff) | |
Merge branch 'feature-settings-tab' into develop
Diffstat (limited to 'src/main/resources/unitsfile.txt')
| -rw-r--r-- | src/main/resources/unitsfile.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/resources/unitsfile.txt b/src/main/resources/unitsfile.txt index eafe885..340e8ea 100644 --- a/src/main/resources/unitsfile.txt +++ b/src/main/resources/unitsfile.txt @@ -251,15 +251,22 @@ Calorie kilocalorie Cal Calorie Wh W h -# Extra units to only include in the dimension-based converter +# 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 km/h km / h |