Resolve Go dependency merge conflict while preserving merged updates

This commit is contained in:
Sebastian Unterschütz committed 2026-10-11 20:08:28 +02:00
commit c9a4b5006c
5 files changed
+28 -9

No files matched your search

+7 -6
View File
@@ -4,23 +4,24 @@ go 1.26.0
require (
github.com/gorilla/websocket v1.5.3
github.com/hajimehoshi/ebiten/v2 v2.9.6
github.com/hajimehoshi/ebiten/v2 v2.10.5
github.com/nats-io/nats.go v1.54.0
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
golang.org/x/image v0.31.0
golang.org/x/image v0.45.0
)
require (
github.com/ebitengine/gomobile v0.0.0-20250923094054-ea854a63cce1 // indirect
github.com/ebitengine/gomobile v0.0.0-20260820040257-d11f821a26a6 // indirect
github.com/ebitengine/hideconsole v1.0.0 // indirect
github.com/ebitengine/oto/v3 v3.4.0 // indirect
github.com/ebitengine/purego v0.9.0 // indirect
github.com/ebitengine/oto/v3 v3.5.0 // indirect
github.com/ebitengine/purego v0.11.0 // indirect
github.com/hajimehoshi/go-mp3 v0.3.4 // indirect
github.com/jezek/xgb v1.1.1 // indirect
github.com/jfreymuth/pulse v0.1.3 // indirect
github.com/klauspost/compress v1.20.0 // indirect
github.com/nats-io/nkeys v0.4.16 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
golang.org/x/crypto v0.57.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.48.0 // indirect
)