Adapt code to new repository

tools/auth/internal/jwk/jwk_test.go

@@ -16,7 +16,7 @@ import (
 	"testing"
 
 	"github.com/golang-jwt/jwt/v5"
-	"github.com/pocketbase/pocketbase/tools/auth/internal/jwk"
+	"github.com/tabshift-gh/pocketbase/tools/auth/internal/jwk"
 )
 
 type publicKey interface {

tools/cron/cron.go

@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pocketbase/pocketbase/tools/routine"
+	"github.com/tabshift-gh/pocketbase/tools/routine"
 )
 
 // Cron is a crontab-like struct for tasks/jobs scheduling.

tools/dbutils/select_test.go

@@ -3,7 +3,7 @@ package dbutils_test
 import (
 	"testing"
 
-	"github.com/pocketbase/pocketbase/tools/dbutils"
+	"github.com/tabshift-gh/pocketbase/tools/dbutils"
 )
 
 func TestAliasOrIdentifier(t *testing.T) {

tools/filesystem/filesystem.go

@@ -412,7 +412,6 @@ var inlineServeContentTypes = []string{
 
 // manualExtensionContentTypes is a map of file extensions to content types.
 var manualExtensionContentTypes = map[string]string{
-<<<<<<< HEAD
 	// https://github.com/whatwg/mimesniff/issues/7
 	".svg": "image/svg+xml",
 
@@ -421,11 +420,6 @@ var manualExtensionContentTypes = map[string]string{
 
 	// https://github.com/pocketbase/pocketbase/issues/6597
 	".js":  "text/javascript",
-=======
-	".svg": "image/svg+xml",   // (see https://github.com/whatwg/mimesniff/issues/7)
-	".css": "text/css",        // (see https://github.com/gabriel-vasile/mimetype/pull/113)
-	".js":  "text/javascript", // (see https://github.com/tabshift-gh/pocketbase/issues/6597)
->>>>>>> 795cd833 (adjust code to new repository)
 	".mjs": "text/javascript",
 
 	// https://github.com/pocketbase/pocketbase/discussions/7467

tools/filesystem/internal/s3blob/s3/uploader.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/pocketbase/pocketbase/tools/routine"
+	"github.com/tabshift-gh/pocketbase/tools/routine"
 	"golang.org/x/sync/errgroup"
 )
 

tools/search/multi_match_subquery_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase/tools/search"
+	"github.com/tabshift-gh/pocketbase/tools/search"
 )
 
 func TestMultiMatchSubqueryBuild(t *testing.T) {