Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed conflict indicators

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-19 19:20:44 +00:00
parent 09a1dffa32
commit a125b1b9d5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/helpview/src/helpview.h
View File

@@ -20,15 +20,11 @@
// If 1, start a server to allow this to be used // If 1, start a server to allow this to be used
// as an external help viewer. // as an external help viewer.
<<<<<<< helpview.h
#define hvUSE_IPC 0
=======
#if defined(__WXMAC__) && !defined(__UNIX__) #if defined(__WXMAC__) && !defined(__UNIX__)
#define hvUSE_IPC 0 #define hvUSE_IPC 0
#else #else
#define hvUSE_IPC 1 #define hvUSE_IPC 1
#endif #endif
>>>>>>> 1.5
#if hvUSE_IPC #if hvUSE_IPC
#include <wx/ipc.h> #include <wx/ipc.h>