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

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

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

Conflicts:
	.emacs
	.gitignore
	.gnus.el.swp
#Some more info ....