Fixed merge conflict

This commit is contained in:
Ion Gaztañaga
2024-09-13 21:11:01 +02:00

View File

@@ -243,6 +243,7 @@ template
>
class named_proxy
{
typedef T object_type;
typedef typename SegmentManager::char_type char_type;
const char_type * mp_name;
SegmentManager * mp_mngr;