commit 55d3b7cd205593e3a2bbc8654c291c339ba15cc2
Merge: c8d31922 5c7b6231
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Sat Jan 22 07:36:21 2022 +0100
Commit:     GitHub <noreply@github.com>
CommitDate: Sat Jan 22 07:36:21 2022 +0100

    Merge pull request #1433 from chocolate-doom/setup-merge

    Change setup tool to use -merge instead of -file.

 src/setup/multiplayer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)