chris/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing a bunch of broken stuff I think

Browse source
This commit is contained in:
Chris Cochrun 2022-02-25 14:16:41 -06:00
parent 0dbc3ead0e
commit 8bace887a2
1551 changed files with 299 additions and 57481 deletions
Download patch file Download diff file Expand all files Collapse all files

15
var/eshell/lastdir
View file

@ -1,4 +1,7 @@
<<<<<<< HEAD
/home/chris/org/my-org-site/content
=======
>>>>>>> bc54f870 (fixing a bunch of broken stuff I think)
/home/chris/org/my-org-site
/home/chris/dev/dmw
/home/chris/dev/dmw/lib/routes
@ -23,6 +26,7 @@
~/nextcloud/home/Documents/attachments
/home/chris/org/lessons
~
<<<<<<< HEAD
/home/chris/dev/church-presenter/src/qml/presenter
/home/chris/dev/church-presenter
/home/chris/dev/church-presenter/src
@ -31,3 +35,14 @@
/home/chris/.local/share
/home/chris/.local/share/presenter
/home/chris/.local/share/presenter/Church Presenter
=======
/home/chris/dev/church-presenter
/home/chris/dev/church-presenter
/home/chris/.local/share/presenter/Church Presenter
/home/chris/.local/share/presenter/Church Presenter
/home/chris/dev/church-presenter/src/qml/presenter
/home/chris/.local/share/presenter/Church Presenter
/home/chris/dev/church-presenter/src
/home/chris/dev/church-presenter
/home/chris/dev/church-presenter/src
>>>>>>> bc54f870 (fixing a bunch of broken stuff I think)