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

resolved conflict

Browse Source 
git-svn-id: svn://10.0.0.236/branches/NORMANDY_BEACH_BRANCH@3816 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ricardob
1998-06-15 21:25:17 +00:00
parent a3933e8c92
commit fcbaa50bf3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/config/liteness.mak
View File

@@ -166,7 +166,6 @@ MOZ_COMMUNICATOR_ABOUT=1
MOZ_COMMUNICATOR_CONFIG_JS=1
MOZ_COPY_ALL_JARS=1
MOZ_SPELLCHK=1
<<<<<<< liteness.mak
!endif
!ifdef MOZ_JAVA
@@ -182,7 +181,4 @@ MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
### This probably isn't the best place to put this.
!if defined(MOZ_NGLAYOUT)
MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_NGLAYOUT
=======
MOZ_CALENDAR=1
>>>>>>> 3.1.16.4
!endif