From 79767ac1e4c1c540866bb22b8f0fca97f03018b9 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Tue, 28 Jan 2020 20:12:38 -0500
Subject: [PATCH] FIX merge conflict garbage

---
 drawing/Processor.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drawing/Processor.lua b/drawing/Processor.lua
index f913957..7a109dc 100644
--- a/drawing/Processor.lua
+++ b/drawing/Processor.lua
@@ -122,13 +122,8 @@ local hwp = {
 	  x 			= _RIGHT_X_,
 	  y 			= _HWP_Y_,
 	  x_align 	= 'right',
-<<<<<<< HEAD
-	  text_color 	= _G_Patterns_.PURPLE,
-	  text		= '<R> | <S> | <D> | <T> | <Z>'
-=======
 	  text_color 	= _G_Patterns_.BLUE,
 	  text		= '<hwp_pref>'
->>>>>>> tmp
    }
 }