fuck git
This commit is contained in:
@@ -4,7 +4,11 @@ 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"
|
||||||
|
>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
|
||||||
"git.nkpl.cc/twocookedfaggots/imageutils/util"
|
"git.nkpl.cc/twocookedfaggots/imageutils/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user