From 9f919459d0aa0492f0c39ddfeebea44c5ba69c2e Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Sun, 10 Nov 2024 17:23:04 +0100
Subject: [PATCH] Fix merge conflict

---
 src/lib.rs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index dbb643f..15d8a34 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -381,15 +381,6 @@ impl DatabaseName<'_> {
             DatabaseName::C(cs)
         }
     }
-    #[cfg(feature = "hooks")]
-    pub(crate) fn from_cstr(db_name: &std::ffi::CStr) -> DatabaseName<'_> {
-        let s = db_name.to_str().expect("illegal database name");
-        match s {
-            "main" => DatabaseName::Main,
-            "temp" => DatabaseName::Temp,
-            _ => DatabaseName::Attached(s),
-        }
-    }
 }
 
 /// A connection to a SQLite database.