attic-lock x n
Merge branch 'master' of github.com:AtticHacker/.dotfiles

merging
emacs