From 311b2f49c4fa83a08a9d47654bc92a645e4dac3b Mon Sep 17 00:00:00 2001
From: Mariano Alvira <malvira@hotdog.Belkin>
Date: Fri, 8 May 2009 15:33:05 -0400
Subject: [PATCH] finish merge of fast with repeat with second stage loading

---
 mc1322x-load.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mc1322x-load.pl b/mc1322x-load.pl
index 21bdd28cb..76c852a66 100755
--- a/mc1322x-load.pl
+++ b/mc1322x-load.pl
@@ -43,7 +43,6 @@ $ob->stopbits(1);
 $ob->handshake("rts");
 $ob->read_const_time(1000); # 1 second per unfulfilled "read" call
 
-<<<<<<< HEAD:mc1322x-load.pl
 my $s = 0;
 
  SEND: