From 58cc16f314e4bc0da427fc5d0ac01f16781b7abd Mon Sep 17 00:00:00 2001
From: mpohoreski <mpohoreski@b5e51362-a710-0410-a134-be2176fc2e42>
Date: Mon, 26 Oct 2009 01:45:26 +0000
Subject: [PATCH]

---
 docs/Debugger_Changelog.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt
index 3fad0f0b..3a4b4d2b 100644
--- a/docs/Debugger_Changelog.txt
+++ b/docs/Debugger_Changelog.txt
@@ -9,7 +9,6 @@
     DB symbol start:end
 2.6.2.x
 
-<<<<<<< .mine
 2.6.1.x
 .35 Fixed: Pressing enter on blank line while in assembler wouldn't exit it.
 .34 Fixed: Scrolling past top of the console output wouldn't draw blank lines