Removed conflict indicators

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

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index 92327bf462dc7ec8da5e429d64d3056a42ac286c..d4fc4cde2ec147ed0fd4064eab262d03960fe2ae 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -20,15 +20,11 @@
 
 // If 1, start a server to allow this to be used
 // as an external help viewer.
 
 // If 1, start a server to allow this to be used
 // as an external help viewer.

-<<<<<<< helpview.h
-#define hvUSE_IPC 0
-=======

 #if defined(__WXMAC__) && !defined(__UNIX__)
 #define hvUSE_IPC 0
 #else
 #define hvUSE_IPC 1
 #endif
 #if defined(__WXMAC__) && !defined(__UNIX__)
 #define hvUSE_IPC 0
 #else
 #define hvUSE_IPC 1
 #endif

->>>>>>> 1.5

 
 #if hvUSE_IPC
 #include <wx/ipc.h>
 
 #if hvUSE_IPC
 #include <wx/ipc.h>