FIX merge conflict garbage

2020-01-28 20:12:38 -05:00 · 2020-01-28 20:12:38 -05:00 · 79767ac1e4
parent 17ca811255
commit 79767ac1e4
1 changed files with 0 additions and 5 deletions
--- 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
   }
 }