From e1f06880a0b02d0cd73fbf0167872126c88048be Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Sun, 20 Jun 2010 04:39:54 -0500
Subject: [PATCH] clean up left over merge marker

---
 docs/gotcha.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 790d62dde..678240cb7 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -128,8 +128,6 @@ save you many hours of grief.
       prefix from the filename.
 
 
-
->>>>>>> master
 7.8.0
 --------------------------------------------------------------------