Merge remote-tracking branch 'origin/submit-follow' into submit-follow

# Conflicts: # test/unit/state/hal-forms.ts
badgateway · Sep 23, 2024 · 1e9e360 · 1e9e360
2 parents 68fdca6 + ca57c51
commit 1e9e360
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/unit/state/hal-forms.ts b/test/unit/state/hal-forms.ts
@@ -3,7 +3,7 @@ import { factory } from '../../../src/state/hal';
 import { Action, Client, Field } from '../../../src';
 import { HalFormsProperty } from 'hal-types';
 
-type CompareAction = Omit<Omit<Action, 'submit' | 'field'>, 'submitFollow'>;
+type CompareAction = Omit<Action, 'submit' | 'field' |  'submitFollow'>;
 
 describe('HAL forms', () => {