From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 19 Mar 2003 19:20:44 +0000 (+0000)
Subject: Removed conflict indicators
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a125b1b9d5ee1d3dce17e9e498f4c3400f71fd54?ds=inline

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 92327bf462..d4fc4cde2e 100644
--- 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.
-<<<<<<< helpview.h
-#define hvUSE_IPC 0
-=======
 #if defined(__WXMAC__) && !defined(__UNIX__)
 #define hvUSE_IPC 0
 #else
 #define hvUSE_IPC 1
 #endif
->>>>>>> 1.5
 
 #if hvUSE_IPC
 #include <wx/ipc.h>