unmerge
Merge branch 'master' of github.com:Heather/gentoo-heather

	modified:   ../../app-shells/fish/fish-9999.ebuild
	modified:   ../../sys-kernel/dkms/dkms-2.2.0.0.ebuild