'temp'
'cleaning'
Resolving conflicts
Merge branch 'master' of https://github.com/hemze/emacs
two init files (linux & win)