diff -r 60e6b8174aee -r 8c1f6458c907 .emacs-my
--- a/.emacs-my	Sun Nov 01 15:11:09 2015 +0200
+++ b/.emacs-my	Sun Nov 01 15:13:52 2015 +0200
@@ -1627,11 +1627,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "TODO, XXX, FIXME highlight")
 
-(defface my-contrasty-face
-  '((t :background "pink" :foreground "red" :weight bold))
-  "Font for showing conflicts."
-  :group 'basic-faces)
-
 (dolist (mode (append my-devel-mode-list my-text-mode-list))
   (font-lock-add-keywords
    mode