it's a generated file, keep it here?
pkgs
Merge branch 'master' of github.com:cycojesus/emacs

Conflicts:
	emacs-custom.el
	saved-packages