fix merging error

CUBRID · Apr 23, 2024 · af9989d · af9989d
1 parent 03fe1f8
commit af9989d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/src/object/schema_system_catalog.cpp b/src/object/schema_system_catalog.cpp
@@ -80,11 +80,7 @@ namespace cubschema
     CT_TRIGGER_NAME,			// "db_trigger"
 
     /* currently, not implemented */
-<<<<<<< HEAD
     CT_RESOLUTION_NAME		// "_db_resolution"
-=======
-    CT_RESOLUTION_NAME,		// "_db_resolution"
->>>>>>> cef37b5f9 ([CBRD-24921] Refactor defining system catalogs in boot_cl.c)
   };
 
   static const std::vector <std::string> sm_system_vclass_names =
@@ -122,12 +118,7 @@ bool sm_check_system_class_by_name (const std::string_view name)
 {
   // TODO: bool is_enclosed = identifier_store::is_enclosed (name);
   return identifier_store::check_identifier_is_valid (name, false)
-<<<<<<< HEAD
 	 && (sm_is_system_class (name) || sm_is_system_vclass (name));
-=======
-	 && (cubschema::sm_catalog_class_names.is_exists (name)
-	     || cubschema::sm_catalog_vclass_names.is_exists (name));
->>>>>>> cef37b5f9 ([CBRD-24921] Refactor defining system catalogs in boot_cl.c)
 }
 
 bool sm_is_system_class (const std::string_view name)

diff --git a/src/object/schema_system_catalog.hpp b/src/object/schema_system_catalog.hpp
@@ -31,10 +31,6 @@
 extern EXPORT_IMPORT void catcls_init (void);
 extern EXPORT_IMPORT int catcls_install (void);
 
-<<<<<<< HEAD
-=======
-// test class_name is of system (class/vclass)s for legacy routine
->>>>>>> cef37b5f9 ([CBRD-24921] Refactor defining system catalogs in boot_cl.c)
 extern EXPORT_IMPORT bool sm_check_system_class_by_name (const std::string_view class_name);
 
 extern EXPORT_IMPORT bool sm_is_system_class (const std::string_view name);