From 1f37df22b84558c7669d567ac32c7e6286f43a19 Mon Sep 17 00:00:00 2001 From: Huaaudio Date: Mon, 23 Mar 2026 04:02:55 +0100 Subject: [PATCH] resolve conflicts --- pkg/agent/loop.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go index 5101d4d06..58d0efe4b 100644 --- a/pkg/agent/loop.go +++ b/pkg/agent/loop.go @@ -18,7 +18,6 @@ import ( "sync/atomic" "time" - "github.com/sipeed/picoclaw/pkg/asr" "github.com/sipeed/picoclaw/pkg/bus" "github.com/sipeed/picoclaw/pkg/channels" "github.com/sipeed/picoclaw/pkg/commands" @@ -32,6 +31,7 @@ import ( "github.com/sipeed/picoclaw/pkg/state" "github.com/sipeed/picoclaw/pkg/tools" "github.com/sipeed/picoclaw/pkg/utils" + "github.com/sipeed/picoclaw/pkg/asr" ) type AgentLoop struct {