From 5fcb324069c587a85f3b90fb315daadb11645df0 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconnection.org>
Date: Tue, 23 Mar 2021 07:01:31 -0500
Subject: [PATCH] fixing eshell diff

---
 eshell/history | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eshell/history b/eshell/history
index 90b4dea5..02023488 100644
--- a/eshell/history
+++ b/eshell/history
@@ -110,12 +110,9 @@ cat /tmp/bongo-mpv.socket
 youtube-dl --list-formats
 youtube-dl --list-formats https://www.youtube.com/watch?v=ry8T67AgbUM
 ls
-<<<<<<< HEAD
 cd
 ls
 rm Dynamic\ DNS\ Client\ \ 2.0.0.7\ Beta.exe
 ls
 cat xmrtobtcwall.txt
 cp mimeapps.list mimeapps.list.bak
-=======
->>>>>>> aa13c8e774c5b244c5fe6a1326d3a0b0ef3465d4