Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge problems

Browse Source 
git-svn-id: svn://10.0.0.236/branches/NORMANDY_BEACH_BRANCH@3889 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
spider
1998-06-16 16:41:57 +00:00
parent 9ce0e78d51
commit 31a77dfa34
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/cmd/xfe/mozilla.c
View File

@@ -39,7 +39,9 @@
#include "secrng.h"
#include "mozjava.h"
#include "nlsxp.h"
#ifdef MOZ_SMARTUPDATE
#include "softupdt.h"
#endif
#ifdef NSPR20
#include "private/prpriv.h" /* for PR_NewNamedMonitor */
#endif /* NSPR20 */
@@ -144,11 +146,7 @@ extern int XFE_RESOURCES_NOT_INSTALLED_CORRECTLY;
extern int XFE_USAGE_MSG1;
extern int XFE_USAGE_MSG2;
extern int XFE_USAGE_MSG3;
/* <<<<<<< mozilla.c rb, start conflict */
#if defined(MOZ_MAIL_NEWS) || defined(EDITOR) || defined(MOZ_TASKBAR)
/* =======
#if defined(MOZ_MAIL_NEWS) && defined(EDITOR) && defined(MOZ_TASKBAR)
>>>>>>> 3.4.14.6 end conflict */
extern int XFE_USAGE_MSG4;
#endif
extern int XFE_USAGE_MSG5;