fuck git

2026-06-20 15:18:52 +03:00
parent c8bfe0777b b75a8814a2
commit f27f44c89d
2 changed files with 7 additions and 0 deletions
@@ -4,7 +4,11 @@ import (
 	"flag"
 	"image"

+<<<<<<< HEAD
 	"git.nkpl.cc/twocookedfaggots/imageutils/pkg/downscale"
+=======
+	"git.nkpl.cc/twocookedfaggots/imageutils/downscale"
+>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 	"git.nkpl.cc/twocookedfaggots/imageutils/util"
 )