#Some more info ....
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.emacs.d/org-clock-save.el
#Some more info ....
#Some more info ....
#Some more info ....
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.emacs.d/tramp
	.gitignore
#Some more info ....
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.gitignore
	Zettelkasten/zettelkasten.org
#Some more info ....
#Some more info ....