Merge conflict with ddnet/pulls/5092

Failed to merge https://github.com/ddnet/ddnet/pull/5092 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.cpp
    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/serverbrowser_http.h
    modified:   src/engine/client/updater.cpp
    modified:   src/engine/client/updater.h
    modified:   src/engine/serverbrowser.h
    modified:   src/engine/shared/demo.cpp
    new file:   src/engine/shared/http.cpp
    new file:   src/engine/shared/http.h
    modified:   src/engine/shared/serverinfo.cpp
    modified:   src/game/client/components/skins.cpp
    modified:   src/game/client/components/skins.h
    modified:   src/test/str.cpp

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

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()

src/engine/client.h
    virtual void GenerateTimeoutSeed() = 0;

    virtual IFriends *Foes() = 0;

    virtual void GetSmoothTick(int *pSmoothTick, float *pSmoothIntraTick, float MixAmount) = 0;

    virtual SWarning *GetCurWarning() = 0;

    virtual CChecksumData *ChecksumData() = 0;
    virtual bool InfoTaskRunning() = 0;
<<<<<<< HEAD

    // chillerbot

    virtual void ChillerBotLoadMap(const char *pMap) = 0;
=======
    virtual CHttp *Http() = 0;
>>>>>>> updatebot-test-pull-ddnet
};

class IGameClient : public IInterface

chillerbot / chillerbot-ux

Merge conflict with ddnet/pulls/5092 #103