Merge conflict with ddnet/pulls/5064

[chillerbotpng]

Failed to merge https://github.com/ddnet/ddnet/pull/5064 into chillerbot

$ git status
On branch updatebot-test-pull-chillerbot
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
    modified:   .gitignore
    modified:   ddnet-libs
    modified:   src/base/system.cpp
    modified:   src/base/system.h
    modified:   src/engine/client/client.cpp
    modified:   src/engine/client/client.h
    modified:   src/engine/client/demoedit.cpp
    modified:   src/engine/client/demoedit.h
    deleted:    src/engine/client/http.h
    modified:   src/engine/client/serverbrowser.cpp
    modified:   src/engine/client/serverbrowser.h
    modified:   src/engine/client/serverbrowser_http.cpp
    modified:   src/engine/client/updater.cpp
    modified:   src/engine/client/updater.h
    deleted:    src/engine/masterserver.h
    modified:   src/engine/server/register.cpp
    modified:   src/engine/server/register.h
    modified:   src/engine/server/server.cpp
    modified:   src/engine/server/server.h
    modified:   src/engine/serverbrowser.h
    modified:   src/engine/shared/config_variables.h
    modified:   src/engine/shared/console.cpp
    modified:   src/engine/shared/demo.cpp
    renamed:    src/engine/client/http.cpp -> src/engine/shared/http.cpp
    new file:   src/engine/shared/http.h
    modified:   src/engine/shared/masterserver.cpp
    new file:   src/engine/shared/masterserver.h
    modified:   src/engine/shared/network.h
    modified:   src/engine/shared/network_server.cpp
    modified:   src/engine/shared/serverinfo.cpp
    modified:   src/game/client/components/menus.cpp
    modified:   src/game/client/components/skins.cpp
    modified:   src/game/client/components/skins.h
    new file:   src/mastersrv/Cargo.lock
    new file:   src/mastersrv/Cargo.toml
    deleted:    src/mastersrv/main_mastersrv.cpp
    deleted:    src/mastersrv/mastersrv.cpp
    deleted:    src/mastersrv/mastersrv.h
    new file:   src/mastersrv/src/addr.rs
    new file:   src/mastersrv/src/locations.rs
    new file:   src/mastersrv/src/main.rs
    modified:   src/test/str.cpp
    deleted:    src/tools/fake_server.cpp
    modified:   src/twping/twping.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   CMakeLists.txt

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   ddnet-libs (new commits)

Conflicts:

CMakeLists.txt
  show_dependency_status("DiscordSdk" DiscordSdk)
endif()
if(WEBSOCKETS)
  show_dependency_status("Websockets" WEBSOCKETS)
endif()

if(CLIENT AND VULKAN)
  show_dependency_status("Vulkan" VULKAN)
endif()

<<<<<<< HEAD
if(CLIENT AND NOT(CURL_FOUND))
  message(SEND_ERROR "You must install Curl to compile chillerbot-ux")
=======
if(NOT(CURL_FOUND))
  message(SEND_ERROR "You must install Curl to compile DDNet")
>>>>>>> updatebot-test-pull-ddnet
endif()
if(NOT(PYTHONINTERP_FOUND))
  message(SEND_ERROR "You must install Python to compile chillerbot-ux")
endif()