From 5e7cf3bf9662448102e749c2912ecf89e0006f09 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 9 May 2020 14:30:06 +0100
Subject: [PATCH] Fix rebase

---
 src/openrct2/scripting/Duktape.hpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/openrct2/scripting/Duktape.hpp b/src/openrct2/scripting/Duktape.hpp
index 1a9eb0962d..c3b0e8bf0a 100644
--- a/src/openrct2/scripting/Duktape.hpp
+++ b/src/openrct2/scripting/Duktape.hpp
@@ -208,38 +208,30 @@ namespace OpenRCT2::Scripting
 
     template<typename T> DukValue ToDuk(duk_context* ctx, const T& value) = delete;
     template<typename T> T FromDuk(const DukValue& s) = delete;
+
     template<> inline DukValue ToDuk(duk_context* ctx, const std::nullptr_t&)
     {
         duk_push_null(ctx);
         return DukValue::take_from_stack(ctx);
     }
+
     template<> inline DukValue ToDuk(duk_context* ctx, const std::string_view& value)
     {
         duk_push_lstring(ctx, value.data(), value.size());
         return DukValue::take_from_stack(ctx);
     }
+
     template<size_t TLen> inline DukValue ToDuk(duk_context* ctx, const char (&value)[TLen])
     {
         duk_push_string(ctx, value);
         return DukValue::take_from_stack(ctx);
     }
+
     template<typename T> DukValue ToDuk(duk_context* ctx, const std::optional<T>& value)
     {
         return value ? ToDuk(ctx, *value) : ToDuk(ctx, nullptr);
     }
 
-    template<> inline DukValue ToDuk(duk_context* ctx, const std::nullptr_t&)
-    {
-        duk_push_null(ctx);
-        return DukValue::take_from_stack(ctx);
-    }
-
-    template<> inline DukValue ToDuk(duk_context* ctx, const std::string_view& value)
-    {
-        duk_push_lstring(ctx, value.data(), value.size());
-        return DukValue::take_from_stack(ctx);
-    }
-
 } // namespace OpenRCT2::Scripting
 
 #endif