mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2025-12-13 13:11:43 +00:00
refactor: fix conflicts
Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
This commit is contained in:
parent
832df26efc
commit
92588c9adc
@ -49,11 +49,8 @@ const featuresV142 = [
|
||||
const featuresV150 = [
|
||||
...featuresV142,
|
||||
'tpmPersistentState',
|
||||
<<<<<<< HEAD
|
||||
'untaggedNetworkSetting'
|
||||
=======
|
||||
'untaggedNetworkSetting',
|
||||
'skipSingleReplicaDetachedVol'
|
||||
>>>>>>> 72c6741 (feat: add feature flag)
|
||||
];
|
||||
|
||||
export const RELEASE_FEATURES = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user