dash-to-dock: Removed gnome-shell-extensions-git from conflicts
Drop -git suffix from provides
pomodoro: drop -git suffix from provides
Merge branch 'master' of github.com:haaja/aur

Conflicts:
	gnome-shell-extension-dash-to-dock/PKGBUILD