public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-13 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fix conflicts

Browse Source 
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
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/harvester/config/feature-flags.js
View File

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