Merge branch 'master' of https://github.com/floppycode/home-config

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
bla
bla
Merge branch 'master' of https://github.com/floppycode/home-config

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
nn
Merge branch 'master' of http://github.com/floppycode/home-config

Conflicts:
	.emacs
i
123
v
Merge branch 'master' of https://github.com/floppycode/home-config

# Please enter a commit message to explain why this merge is necessary,
Merge branch 'master' of https://github.com/floppycode/home-config

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
c
s
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.emacs
	.emacs.d/bookmarks
i
Merge branch 'master' of http://github.com/floppycode/home-config

Conflicts:
	.emacs.d/bookmarks
	.pentadactylrc
	Zettelkasten/Software.org
c
c
Merge branch 'master' of http://github.com/floppycode/home-config