From 92588c9adc3391283ad4661f065f49608eee1415 Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Wed, 12 Feb 2025 09:35:21 +0800
Subject: [PATCH] refactor: fix conflicts

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/config/feature-flags.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index 61446889..2cfeb945 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -49,11 +49,8 @@ const featuresV142 = [
 const featuresV150 = [
   ...featuresV142,
   'tpmPersistentState',
-<<<<<<< HEAD
-  'untaggedNetworkSetting'
-=======
+  'untaggedNetworkSetting',
   'skipSingleReplicaDetachedVol'
->>>>>>> 72c6741 (feat: add feature flag)
 ];
 
 export const RELEASE_FEATURES = {