]> git.bundesbrandschatzamt.de Git - emacsconfig.git/commit
merge conflict solved.
authorAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 1 Apr 2014 11:03:50 +0000 (11:03 +0000)
committerAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 1 Apr 2014 11:03:50 +0000 (11:03 +0000)
commitb16ff2b5da35eb35ff781926dc441d6473fac27f
tree9b87e25520d214951001805aa73fd5951bd338c0
parent91d103288c93d8032a56eeec411ff13f6c4a61ec
merge conflict solved.

Signed-off-by: Andreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
init.el