refactor: fix conflicts

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
This commit is contained in:
Yi-Ya Chen 2025-02-12 09:35:21 +08:00
parent 832df26efc
commit 92588c9adc
No known key found for this signature in database
GPG Key ID: 9A2E6FBD33F68EDE

View File

@ -49,11 +49,8 @@ const featuresV142 = [
const featuresV150 = [
...featuresV142,
'tpmPersistentState',
<<<<<<< HEAD
'untaggedNetworkSetting'
=======
'untaggedNetworkSetting',
'skipSingleReplicaDetachedVol'
>>>>>>> 72c6741 (feat: add feature flag)
];
export const RELEASE_FEATURES = {