what the fuck are you doin to my files git

2026-06-20 15:23:14 +03:00
parent f27f44c89d
commit afd438930e
2 changed files with 1 additions and 7 deletions
@@ -1,14 +1,11 @@
-package main
+packagemain

 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,13 +1,10 @@
 package downscale

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

-=======
->>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 type sub struct {
 	image.Image
 	image.Rectangle