Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

This commit is contained in:
Chris Cochrun 2021-03-23 07:00:41 -05:00
commit f3050bd14a
3 changed files with 26 additions and 8 deletions

View file

@ -110,9 +110,12 @@ 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