mirror of
https://github.com/josdejong/mathjs.git
synced 2026-01-25 15:07:57 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
2c819ea9f0
@ -2452,14 +2452,14 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
|
||||
joule: {
|
||||
name: 'joule',
|
||||
base: BASE_UNITS.ENERGY,
|
||||
prefixes: PREFIXES.SHORT,
|
||||
prefixes: PREFIXES.LONG,
|
||||
value: 1,
|
||||
offset: 0
|
||||
},
|
||||
erg: {
|
||||
name: 'erg',
|
||||
base: BASE_UNITS.ENERGY,
|
||||
prefixes: PREFIXES.NONE,
|
||||
prefixes: PREFIXES.SHORTLONG, // Both kiloerg and kerg are acceptable
|
||||
value: 1e-7,
|
||||
offset: 0
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user