Merge conflict with ddnet/pulls/4813

[chillerbotpng]

Failed to merge https://github.com/ddnet/ddnet/pull/4813 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:   CMakeLists.txt
    modified:   src/game/client/prediction/entities/laser.cpp
    modified:   src/game/editor/editor.h
    modified:   src/game/server/entities/laser.cpp

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

Conflicts:

src/base/system.h

    Returns:
        0 - Success in getting the version.
        1 - Failure in getting the version.
*/
int os_version_str(char *version, int length);

#if defined(CONF_EXCEPTION_HANDLING)
void init_exception_handler();
void set_exception_handler_log_file(const char *log_file_path);
<<<<<<< HEAD
#endif

#if defined(CONF_CURSES_CLIENT)
void curses_logf(const char *sys, const char *fmt, ...);
#define dbg_msg(sys, fmt, ...) curses_logf(sys, fmt, ##__VA_ARGS__)
=======
>>>>>>> updatebot-test-pull-ddnet
#endif

#if defined(__cplusplus)

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;
=======
>>>>>>> updatebot-test-pull-ddnet
};

class IGameClient : public IInterface
{