uncommented merge() call from last commit

flipcoder · flipcoder · commit 4e2065763f84 · 2020-12-29T11:18:38.000-08:00
diff --git a/kit/meta/meta.inl b/kit/meta/meta.inl
@@ -19,7 +19,7 @@ Meta_<Mutex,Ptr,This> :: Meta_(const Ptr<Meta_<Mutex,Ptr,This>>& rhs)
     //clear();
     //auto tmp = make_shared<Meta>();
     //tmp->merge(rhs);
-    //merge(rhs);
+    merge(rhs);
 }
 
 template<class Mutex, template <class> class Ptr, template <typename> class This>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ Meta_<Mutex,Ptr,This> :: Meta_(const Ptr<Meta_<Mutex,Ptr,This>>& rhs)`
`19`	`19`	`//clear();`
`20`	`20`	`//auto tmp = make_shared<Meta>();`
`21`	`21`	`//tmp->merge(rhs);`
`22`		`- //merge(rhs);`
	`22`	`+ merge(rhs);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`template<class Mutex, template <class> class Ptr, template <typename> class This>`