From 675d3818d9b9f7f862f739adb2af5d89fb155d04 Mon Sep 17 00:00:00 2001
From: Jacob Matthews <jacobm@cs.uchicago.edu>
Date: Mon, 4 Dec 2006 06:03:49 +0000
Subject: [PATCH] fixed some conflict bars that snuck in to the doc.txt

svn: r5015
---
 collects/planet/doc.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/collects/planet/doc.txt b/collects/planet/doc.txt
index 16d083d83c..512dc8f7c0 100644
--- a/collects/planet/doc.txt
+++ b/collects/planet/doc.txt
@@ -475,11 +475,7 @@ If present, this field should be a list of strings representing
 subdirectories of your package. These directories will be used by
 Help Desk as HTML documentation for your package. See
 _Creating Help Desk Documentation in HTML format_ for more information
-<<<<<<< .mine
 on how to write useful HTML Help Desk documentation.
-=======
-on how to use HTML Help Desk documentation.
->>>>>>> .r4715
 
 The _'homepage field_