From cd95e326963e750405c7ff94681c0edc11c4f207 Mon Sep 17 00:00:00 2001
From: Aryadev Chavali <aryadev@aryadevchavali.com>
Date: Thu, 13 Jan 2022 04:58:39 +0000
Subject: (Emacs)-merge feature

---
 Emacs/.config/emacs/config.org | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Emacs/.config/emacs')

diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org
index 2f45cb2..15045ea 100644
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -159,7 +159,6 @@ common use of this macro.
         (setq pairs (cdr pairs))))
     `(cond
       ,@current-lisp)))
->>>>>>> origin/master
 #+end_src
 * Aesthetics
 Load my custom "personal-theme" theme which is stored in the Emacs lisp
-- 
cgit v1.2.3-13-gbd6f