fix file

f0ssel · f0ssel · commit 4344a15c1187 · 2024-07-12T17:20:04.000Z
diff --git a/coderd/notifications/manager_test.go b/coderd/notifications/manager_test.go
@@ -7,12 +7,18 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coder/serpent"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
+<<<<<<< HEAD
 	"github.com/coder/serpent"
+=======
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+>>>>>>> dadd7609f (fix file)
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
