From 8ddffaa3f3c3edfd49dc5c2bd2285f10afbf9bf3 Mon Sep 17 00:00:00 2001
From: Alix-007 <llagy007@gmail.com>
Date: Fri, 13 Mar 2026 08:25:35 +0800
Subject: [PATCH] fix(irc): resolve merge conflicts with latest main

---
 pkg/config/flexible_string_slice_test.go | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkg/config/flexible_string_slice_test.go b/pkg/config/flexible_string_slice_test.go
index a5bb1763d..018aa3478 100644
--- a/pkg/config/flexible_string_slice_test.go
+++ b/pkg/config/flexible_string_slice_test.go
@@ -1,19 +1,19 @@
-package config
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-)
-
-func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) {
-	var got FlexibleStringSlice
-	if err := json.Unmarshal([]byte(`"general, #ops，dev"`), &got); err != nil {
-		t.Fatalf("Unmarshal() error = %v", err)
-	}
-
-	want := FlexibleStringSlice{"general", "#ops", "dev"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want)
-	}
-}
+package config
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+)
+
+func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) {
+	var got FlexibleStringSlice
+	if err := json.Unmarshal([]byte(`"general, #ops，dev"`), &got); err != nil {
+		t.Fatalf("Unmarshal() error = %v", err)
+	}
+
+	want := FlexibleStringSlice{"general", "#ops", "dev"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want)
+	}
+}