From ec974d23005b5f225fe59e674d664b248619f3b2 Mon Sep 17 00:00:00 2001
From: George Tasker <gtasker@allenbrook.com>
Date: Fri, 17 Mar 2000 11:18:46 +0000
Subject: [PATCH] RCS left a turd in the previous checkin

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/db.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/wx/db.h b/include/wx/db.h
index 8d38e830a3..ab4310297b 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -545,7 +545,6 @@ typedef wxDbList DbList;
 typedef wxTablesInUse CstructTablesInUse;
 #endif
 
->>>>>>> 1.30
 // Deprecated function names that are replaced by the function names listed above
 wxDB  WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
 bool  WXDLLEXPORT  FreeDbConnection(wxDB *pDb);
-- 
2.45.2