X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfe835d075811cc32e8e1340e8c84bdcd014def2..77e0239d76ac5f2dbe9ba53e3278184ce83868ed:/src/motif/app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4fd539d71c..63cfd7ab1c 100644
--- 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.