# HG changeset patch
# User JeanDo
# Date 1291743186 -3600
# Node ID de8ed3c55db1541e575ed52ca5a8736ba37c9c3b
# Parent  cc657f9915d8ed06841dcfb6e90af90a07b5dd08
FIX branch merging

diff -r cc657f9915d8 -r de8ed3c55db1 code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Mon Dec 06 17:12:39 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Dec 07 18:33:06 2010 +0100
@@ -69,7 +69,7 @@
 	call	PLED_set_color
 	return
 PLED_standard_color2:
-	movlw	color_standard1		; Reset Color
+	movlw	0xFF		        ; Force full white.
 	call	PLED_set_color
 	return