1 files changed, 1 insertions, 1 deletions

diff --git a/.emacs b/.emacs
index a176df6..fcd70e3 100644
--- a/.emacs
+++ b/.emacs
@@ -197,7 +197,7 @@
 
 (show-paren-mode 1)
 
-<<<<<<< HEAD
+
 (require 'dired-single)
 
 (defun my-dired-init ()