twocookedfaggots/imageutils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

what the fuck are you doin to my files git

Browse Source
This commit is contained in:
potassium
2026-06-20 15:23:14 +03:00
parent f27f44c89d
commit afd438930e
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/scale/griddownscale.go
+1 -4
View File
@@ -1,14 +1,11 @@
package main packagemain
import ( import (
"flag" "flag"
"image" "image"
<<<<<<< HEAD
"git.nkpl.cc/twocookedfaggots/imageutils/pkg/downscale" "git.nkpl.cc/twocookedfaggots/imageutils/pkg/downscale"
=======
"git.nkpl.cc/twocookedfaggots/imageutils/downscale" "git.nkpl.cc/twocookedfaggots/imageutils/downscale"
>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
"git.nkpl.cc/twocookedfaggots/imageutils/util" "git.nkpl.cc/twocookedfaggots/imageutils/util"
) )
pkg/downscale/grid.go
-3
View File
@@ -1,13 +1,10 @@
package downscale package downscale
<<<<<<< HEAD
import ( import (
"image" "image"
"image/color" "image/color"
) )
=======
>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
type sub struct { type sub struct {
image.Image image.Image
image.Rectangle image.Rectangle