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

+2 -2
View File
@@ -3,10 +3,10 @@ module git.zb-server.de/ZB-Server/EscapeFromTeacher
go 1.26.0
require (
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/redis/go-redis/v9 v9.17.2
golang.org/x/image v0.31.0
golang.org/x/image v0.45.0
)
require (