ndwarshuis
/
conky-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX merge conflict garbage

This commit is contained in:
Nathan Dwarshuis 2020-01-28 20:12:38 -05:00
parent 17ca811255
commit 79767ac1e4
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drawing/Processor.lua
View File

@ -122,13 +122,8 @@ local hwp = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _HWP_Y_, y = _HWP_Y_,
x_align = 'right', x_align = 'right',
<<<<<<< HEAD
text_color = _G_Patterns_.PURPLE,
text = '<R> | <S> | <D> | <T> | <Z>'
=======
text_color = _G_Patterns_.BLUE, text_color = _G_Patterns_.BLUE,
text = '<hwp_pref>' text = '<hwp_pref>'
>>>>>>> tmp
} }
} }