branch: elpa/ujelly-theme
commit 6d8cf8b24ffff707b866b3bef22c78d43c83b325
Author: Mark Tran <[email protected]>
Commit: Mark Tran <[email protected]>
change smerge-markers
---
ujelly-theme.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ujelly-theme.el b/ujelly-theme.el
index 24aa68b..3a62149 100644
--- a/ujelly-theme.el
+++ b/ujelly-theme.el
@@ -2,7 +2,7 @@
;; Author: Mark Tran <[email protected]>
;; URL: http://github.com/marktran/color-theme-ujelly
-;; Version: 1.0.27
+;; Version: 1.0.28
;; Inspired by jellybeans:
http://www.vim.org/scripts/script.php?script_id=2555.
(deftheme ujelly "The ujelly color theme")
@@ -103,7 +103,7 @@
`(org-level-2 ((,class (:foreground ,ujelly-yellow-0))))
`(org-level-3 ((,class (:foreground ,ujelly-purple-0))))
`(region ((,class (:background ,ujelly-purple-1))))
- `(smerge-markers ((,class (:foreground ,ujelly-yellow-0))))
+ `(smerge-markers ((,class (:foreground ,ujelly-yellow-0 :background
,ujelly-grey-2))))
`(smerge-refined-change ((,class (:foreground ,ujelly-green-0))))
`(trailing-whitespace ((,class (:background ,ujelly-red-1))))
`(whitespace-trailing ((,class (:background ,ujelly-red-1))))))
