Removed conflict markers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4fd539d71c4a02be6e22560f49cf9f58e80fda23..63cfd7ab1cc754674a395f19d3ad6ee76d904196 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -306,9 +306,6 @@ void wxApp::ExitMainLoop()
 // Is a message/event pending?
 bool wxApp::Pending()
 {
-<<<<<<< app.cpp
-    return XtAppPending( (XtAppContext) GetAppContext() ) != 0;
-=======
     return m_eventLoop->Pending();
 #if 0
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
@@ -317,7 +314,6 @@ bool wxApp::Pending()
     // is found.
     return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
 #endif
->>>>>>> 1.57
 }
 
 // Dispatch a message.