fixing eshell diff

This commit is contained in:
Chris Cochrun 2021-03-23 07:01:31 -05:00
parent f3050bd14a
commit 5fcb324069

View file

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