coder
diff --git a/‎coderd/database/migrations/000223_provisioner_keys.down.sql renamed to ‎coderd/database/migrations/000226_provisioner_keys.down.sql b/‎coderd/database/migrations/000223_provisioner_keys.down.sql renamed to ‎coderd/database/migrations/000226_provisioner_keys.down.sql
diff --git a/‎coderd/database/migrations/000223_provisioner_keys.up.sql renamed to ‎coderd/database/migrations/000226_provisioner_keys.up.sql b/‎coderd/database/migrations/000223_provisioner_keys.up.sql renamed to ‎coderd/database/migrations/000226_provisioner_keys.up.sql
diff --git a/‎coderd/notifications/manager_test.go
Lines changed: 0 additions & 6 deletions b/‎coderd/notifications/manager_test.go
Lines changed: 0 additions & 6 deletions
@@ -7,18 +7,12 @@ 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"