Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removing yet more conflicts as a result of the normandy merge. ARGH.

Browse Source
This commit is contained in:
cyeh 1998-06-23 05:56:23 +00:00
parent ea085cab4b
commit 1018fcfba9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/rdf/macbuild/RDF.Prefix
View File

@ -23,9 +23,5 @@
//
//
<<<<<<< RDF.Prefix
#include "MacPrefix_debug.h"
=======
#include "MacPrefix.h"
>>>>>>> 3.1.16.2
#include "RDFConfig.h"