[nongnu] elpa/moe-theme 7ee93bc934 240/352: Merge pull request #47 from baskerville/master

[ELPA Syncer]

branch: elpa/moe-theme
commit 7ee93bc9342bbd08b9b04f9ffa5deb9c0d18119a
Merge: f2be5df23a 9d5f979eb6
Author: kuanyui <azazabc123@gmail.com>
Commit: kuanyui <azazabc123@gmail.com>

    Merge pull request #47 from baskerville/master
    
    Remove duplicate faces
---
 moe-dark-theme.el  | 3 ---
 moe-light-theme.el | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index aebae937ca..d92cd30635 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -441,9 +441,6 @@ Moe, moe, kyun!")
    `(message-mml ((,class (:foreground ,orange-2))))
    `(message-separator ((,class (:foreground ,black-2-5))))
 
-   ;; SMerge faces
-   `(smerge-refined-change ((,class (:background ,blue-3))))
-
    ;; Grep
    `(grep-context-face ((,class (:foreground ,red-2))))
    `(grep-error-face ((,class (:foreground ,red-1 :weight bold :underline t))))
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 859a72ccfe..875a540ab4 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -438,9 +438,6 @@ Moe, moe, kyun!")
    `(message-mml ((,class (:foreground ,orange-2))))
    `(message-separator ((,class (:foreground ,white-3))))
 
-   ;; SMerge faces
-   `(smerge-refined-change ((,class (:background ,blue-3))))
-
    ;; Grep
    `(grep-context-face ((,class (:foreground ,red-2))))
    `(grep-error-face ((,class (:foreground ,red-1 :weight bold :underline t))))