resolve conflicts

This commit is contained in:
Huaaudio 2026-03-23 04:02:55 +01:00
parent 818c8ea54d
commit 3948fea57c

View file

@ -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"
@ -33,6 +32,7 @@ import (
"github.com/sipeed/picoclaw/pkg/tools"
"github.com/sipeed/picoclaw/pkg/tts"
"github.com/sipeed/picoclaw/pkg/utils"
"github.com/sipeed/picoclaw/pkg/asr"
)
type AgentLoop struct {