some conflicts resolved

[wxWidgets.git] / src / motif / gdiobj.cpp

diff --git a/src/motif/gdiobj.cpp b/src/motif/gdiobj.cpp
index 0d9e4fec5efc33599720f7fd3421db64c3310bf7..adda2bcab1e92aed48a527217f4dde5a4f015932 100644 (file)
--- a/src/motif/gdiobj.cpp
+++ b/src/motif/gdiobj.cpp
@@ -18,5 +18,3 @@
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 #endif
-
-// TODO: Nothing to do, unless you want to.