adjust code to new repository

tools/filesystem/filesystem.go

@@ -18,12 +18,12 @@ import (
 	"github.com/disintegration/imaging"
 	"github.com/fatih/color"
 	"github.com/gabriel-vasile/mimetype"
-	"github.com/pocketbase/pocketbase/tools/filesystem/blob"
-	"github.com/pocketbase/pocketbase/tools/filesystem/internal/fileblob"
-	"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob"
-	"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
-	"github.com/pocketbase/pocketbase/tools/list"
-	"github.com/pocketbase/pocketbase/tools/routine"
+	"github.com/tabshift-gh/pocketbase/tools/filesystem/blob"
+	"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/fileblob"
+	"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob"
+	"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
+	"github.com/tabshift-gh/pocketbase/tools/list"
+	"github.com/tabshift-gh/pocketbase/tools/routine"
 
 	// explicit webp decoder because disintegration/imaging does not support webp
 	_ "golang.org/x/image/webp"
@@ -412,6 +412,7 @@ 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",
 
@@ -420,6 +421,11 @@ 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