compose-generator
diff --git a/‎cli/go.mod
-6 b/‎cli/go.mod
-6
diff --git a/‎cli/go.sum
-23 b/‎cli/go.sum
-23
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_aix.go
-10 b/‎cli/vendor/golang.org/x/sys/unix/syscall_aix.go
-10
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_bsd.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/syscall_bsd.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
-14 b/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
-14
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
-14 b/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
-14
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
-13 b/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
-13
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
-13 b/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
-13
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
-13 b/‎cli/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
-13
diff --git a/‎cli/vendor/golang.org/x/sys/unix/syscall_linux.go
-7 b/‎cli/vendor/golang.org/x/sys/unix/syscall_linux.go
-7
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
-4 b/‎cli/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
-4
diff --git a/‎cli/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
-3 b/‎cli/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
-3
@@ -21,14 +21,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-<<<<<<< HEAD
-	golang.org/x/sys v0.18.0 // indirect
->>>>>>> 3d19add (Bump github.com/fatih/color from 1.16.0 to 1.17.0 in /cli (#278))
-=======
 	golang.org/x/sys v0.25.0 // indirect
->>>>>>> 7109b45 (Bump github.com/fatih/color from 1.17.0 to 1.18.0 in /cli (#311))
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
->>>>>>> 20c770a (Update dependencies)
@@ -52,28 +52,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-<<<<<<< HEAD
-<<<<<<< HEAD
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-=======
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
->>>>>>> 76eeb1a (Bump github.com/fatih/color from 1.13.0 to 1.14.0 in /cli (#199))
-golang.org/x/term v0.0.0-20210503060354-a79de5458b56 h1:b8jxX3zqjpqb2LklXPzKSGJhzyxCOZSz8ncv8Nv+y7w=
-golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-<<<<<<< HEAD
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-=======
->>>>>>> b5cac81 (Code optimizations)
-=======
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -89,7 +67,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
->>>>>>> 20c770a (Update dependencies)
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=