From 9f44540bc43f7b2597be789360f1d60531eed6cf Mon Sep 17 00:00:00 2001
From: cyeh <cyeh>
Date: Tue, 23 Jun 1998 05:56:23 +0000
Subject: [PATCH] removing yet more conflicts as a result of the normandy
 merge. ARGH.

---
 modules/rdf/macbuild/RDF.Prefix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/rdf/macbuild/RDF.Prefix b/modules/rdf/macbuild/RDF.Prefix
index cb9c171b169..3a9d3a492a2 100644
--- 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"