fuck git

new simple downscaling ideas
2026-06-20 15:18:52 +03:00 · 2026-06-20 11:31:44 +03:00
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"
 )

@@ -1,10 +1,13 @@
 package downscale

+<<<<<<< HEAD
 import (
 	"image"
 	"image/color"
 )

+=======
+>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 type sub struct {
 	image.Image
 	image.Rectangle
Author	SHA1	Message	Date
twocookedfaggots	f27f44c89d	fuck git	2026-06-20 15:18:52 +03:00
twocookedfaggots	b75a8814a2	new simple downscaling ideas	2026-06-20 11:31:44 +03:00