Permalink
Browse files

Corrected merge conflict that seems to have gone passed unnoticed in …

…Git.
  • Loading branch information...
1 parent c2d413a commit 9c8fd22fc828252ee9f6e18476b7c14e9f09fd02 @abudden committed Apr 13, 2012
Showing with 0 additions and 6 deletions.
  1. +0 −6 colors/bandit.txt
View
6 colors/bandit.txt
@@ -3,7 +3,6 @@ Basis:None
Colours:
Violet:#EE82EE
CoralRed:#FF4040
- DavysGrey:#555555
Dark:
Normal:White,Black
Comment:Green
@@ -43,13 +42,8 @@ Dark:
Structure:#FF8080
Special:Red
SpecialChar:#AA0000
-<<<<<<< HEAD
SpecialKey:#777777
NonText:#777777
-=======
- SpecialKey:DavysGrey
- NonText:DavysGrey
->>>>>>> 411744f2fb95ae2b146d8aed2ae420de7a04a3b3
MatchParen:Yellow,Style=Underline
Error:White,Red
NonIndentTabError:SP=#FFAA00,Style=Undercurl

0 comments on commit 9c8fd22

Please sign in to comment.