From bc5d47311067ee39d092e9dd818c0fcf2ee57445 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 12 Apr 2019 05:18:07 +0700
Subject: [PATCH] fix prototype::merge linking error

---
 ecs.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ecs.hpp b/ecs.hpp
index b983501..6224264 100644
--- a/ecs.hpp
+++ b/ecs.hpp
@@ -1797,7 +1797,7 @@ namespace ecs_hpp
         return std::move(*this);
     }
 
-    prototype& prototype::merge(const prototype& other, bool override) & {
+    inline prototype& prototype::merge(const prototype& other, bool override) & {
         for ( const auto family_id : other.appliers_ ) {
             if ( override || !appliers_.has(family_id) ) {
                 appliers_.insert_or_assign(
@@ -1808,7 +1808,7 @@ namespace ecs_hpp
         return *this;
     }
 
-    prototype&& prototype::merge(const prototype& other, bool override) && {
+    inline prototype&& prototype::merge(const prototype& other, bool override) && {
         merge(other, override);
         return std::move(*this);
     }