From 6eb0f1ced5803b7e5450dd07de623a8486a1bab0 Mon Sep 17 00:00:00 2001
From: Julian <julianteule@gmail.com>
Date: Thu, 1 Mar 2018 15:03:28 +0100
Subject: Stuff

---
 .emacs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.emacs')

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 ()
-- 
cgit v1.2.3