forked from mirror/openmw-tes3mp
[Server] Fix rebase conflicts
This commit is contained in:
parent
6a2878820c
commit
f24b8b8738
1 changed files with 2 additions and 2 deletions
|
@ -73,7 +73,7 @@ namespace ServerFunctions
|
|||
*
|
||||
* \return The type of the operating system.
|
||||
*/
|
||||
static const char *GetOperatingSystemType() noexcept;
|
||||
EXPORT_APIFUNCTION const char *CDECL GetOperatingSystemType() noexcept;
|
||||
|
||||
/**
|
||||
* \brief Get the architecture type used by the server.
|
||||
|
@ -82,7 +82,7 @@ namespace ServerFunctions
|
|||
*
|
||||
* \return The architecture type.
|
||||
*/
|
||||
static const char *GetArchitectureType() noexcept;
|
||||
EXPORT_APIFUNCTION const char *CDECL GetArchitectureType() noexcept;
|
||||
|
||||
/**
|
||||
* \brief Get the TES3MP version of the server.
|
||||
|
|
Loading…
Reference in a new issue