diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-03-13 16:21:49 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-03-13 16:21:49 -0500 |
| commit | fe4135a68cfed92ef336eec663e9c42c2c97dcbc (patch) | |
| tree | 2fcf583265be3c575086f3ce3183a3268c997538 /unitsfile.txt | |
| parent | 761ba0b6627df8bc9f6ab41c94f349c84d378609 (diff) | |
| parent | 184b7cc697ffc2dcbd49cfb3d0fd7b14bdac8803 (diff) | |
Merge branch 'feature-settings-tab' into develop
Diffstat (limited to 'unitsfile.txt')
| -rw-r--r-- | unitsfile.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/unitsfile.txt b/unitsfile.txt index a067d14..eafe885 100644 --- a/unitsfile.txt +++ b/unitsfile.txt @@ -157,8 +157,11 @@ hour 3600 second h hour day 86400 second d day +week 7 day +wk week julianyear 365.25 day gregorianyear 365.2425 day +gregorianmonth gregorianyear / 12 # Other non-SI "metric" units litre 0.001 m^3 @@ -180,7 +183,7 @@ waterdensity kilogram / litre # Imperial length units foot 0.3048 m ft foot -inch 1 / 12 foot +inch foot / 12 in inch yard 3 foot yd yard |