From 311b0ec6bb710991337c2857da38f9ddc2065921 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 8 Nov 2011 16:43:30 +0200 Subject: [PATCH] fixed zenburn-theme --- themes/zenburn-theme.el | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/themes/zenburn-theme.el b/themes/zenburn-theme.el index 8940218..37d9cbf 100644 --- a/themes/zenburn-theme.el +++ b/themes/zenburn-theme.el @@ -136,13 +136,9 @@ :box (:line-width -1 :style released-button))))) `(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold)))) `(mode-line-inactive -<<<<<<< HEAD ((,class (:foreground ,zenburn-green-1 - :background ,zenburn-bg-1 + :background ,zenburn-bg-05 :box (:line-width -1 :style released-button))))) -======= - ((,class (:foreground ,zenburn-green-1 :background ,zenburn-bg-05)))) ->>>>>>> b1ccc0ac7975473c30e8555c550733e0b192a0ae `(region ((,class (:background ,zenburn-bg-1)))) `(secondary-selection ((,class (:background ,zenburn-bg+2)))) `(trailing-whitespace ((,class (:background ,zenburn-red))))