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

diff --git a/include/wx/db.h b/include/wx/db.h
index 8d38e830a317325fef71905907d4ec9e61038c1c..ab4310297b40b95d3e628f576c6b8f33bd610e45 100644 (file)
--- 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);