From f24b8b8738d081aaf1da5efbd56760e5efda0c6e Mon Sep 17 00:00:00 2001
From: Koncord <koncord@rwa.su>
Date: Tue, 15 Jan 2019 18:36:23 +0800
Subject: [PATCH] [Server] Fix rebase conflicts

---
 apps/openmw-mp/Script/Functions/Server.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw-mp/Script/Functions/Server.hpp b/apps/openmw-mp/Script/Functions/Server.hpp
index 3698f4f2f..d3a04d559 100644
--- a/apps/openmw-mp/Script/Functions/Server.hpp
+++ b/apps/openmw-mp/Script/Functions/Server.hpp
@@ -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.