# 
# patch "lua.cc"
#  from [0172669d7560e193974016229f4290b288bac556]
#    to [8f42af379ac825a6bbfc0ab13dfd6fc4a878befa]
# 
--- lua.cc
+++ lua.cc
@@ -886,7 +886,6 @@
 }
 
 
-<<<<<<< variant A
 bool
 lua_hooks::hook_use_inodeprints()
 {
@@ -900,23 +899,6 @@
   return use && exec_ok;
 }
 
->>>>>>> variant B
-bool
-lua_hooks::hook_use_inodeprints()
-{
-  bool use = false, exec_ok = false;
-
-  exec_ok = Lua(st)
-    .push_str("use_inodeprints")
-    .get_fn()
-    .call(0, 1)
-    .extract_bool(use)
-    .ok();
-  return use && exec_ok;
-}
-
-####### Ancestor
-======= end
 bool 
 lua_hooks::hook_get_netsync_read_permitted(std::string const & collection, 
                                            rsa_keypair_id const & identity)