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

1998-06-23 05:56:23 +00:00 · 1998-06-23 05:56:23 +00:00 · 9f44540bc4
--- a/modules/rdf/macbuild/RDF.Prefix
+++ b/modules/rdf/macbuild/RDF.Prefix
@ -23,9 +23,5 @@
 //
 //

-<<<<<<< RDF.Prefix
 #include "MacPrefix_debug.h"
-=======
-#include "MacPrefix.h"
->>>>>>> 3.1.16.2
 #include "RDFConfig.h"