Fixed merge issues

This commit is contained in:
Logan 2015-04-22 21:58:13 -07:00
commit 2139d3df72

View file

@ -17,7 +17,7 @@ xterm*wideChars: true
xterm*wideFont: DejaVuSansMono
xterm*faceSize: 10
!!!!!!!tango color scheme!!!!!!
!!!!!!tango color scheme!!!!!!
xterm*color0: #1e1e1e
xterm*color1: #cc0000
xterm*color2: #4e9a06