Remove obsolete not_found_msg

Author: danpoe

src/util/sharing_map.h

@@ -564,7 +564,6 @@ class sharing_mapt
     std::set<const void *> &marked,
     bool mark = true) const;
 
-  static const std::string not_found_msg;
   static const std::size_t dummy_level;
 
   // config
@@ -1291,12 +1290,15 @@ SHARING_MAPT2(optionalt<std::reference_wrapper<const, mapped_type>>)::find(
 
 // static constants
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 SHARING_MAPT(const std::string)::not_found_msg="key not found";
 =======
 SHARING_MAPT(const std::size_t)::dummy_level = 0xff;
 >>>>>>> 3d4acae... WIP
 
+=======
+>>>>>>> e6b5749... Remove obsolete not_found_msg
 SHARING_MAPT(const std::size_t)::bits = 30;
 SHARING_MAPT(const std::size_t)::chunk = 3;