48 lines
1.4 KiB
Text
48 lines
1.4 KiB
Text
<<<<<<< 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
|
|
/home/chris/dev/dmw
|
|
/home/chris/org/lessons
|
|
/home/chris/.emacs.d
|
|
/home/chris/org/lessons
|
|
~/nextcloud/tfc/Documents/2021-2022 lessons
|
|
/home/chris/.emacs.d
|
|
/home/chris/dev/dmw/lib
|
|
/home/chris/dev/dmw
|
|
/home/chris/dev/dmw/lib/students
|
|
/home/chris/dev/dmw
|
|
/home/chris/dotfiles/scripts
|
|
/home/chris/.config/latte
|
|
~
|
|
/home/chris/nextcloud/tfc/Collectives/TFC Staff/Using Nextcloud
|
|
/home/chris/org/lessons
|
|
~
|
|
/home/chris/.emacs.d
|
|
~
|
|
~/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
|
|
/home/chris/.local/share/TFC/Church Presenter
|
|
/home/chris/.local/share/TFC
|
|
/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)
|