[gnome-color-manager] trivial: fix merge conflict and actually make libnotfy conditional

[Richard Hughes <rhughes src gnome org>]

commit c482bb3a77037cffa838109bcb1c5d4695ed49e5
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jun 19 22:42:19 2010 +0100

    trivial: fix merge conflict and actually make libnotfy conditional

 configure.ac |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3dbb4e1..8a0baf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,6 @@ PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-3.0 >= 2.90.0)
 PKG_CHECK_MODULES(GUDEV, gudev-1.0)
 PKG_CHECK_MODULES(LCMS, lcms)
 PKG_CHECK_MODULES(X11, x11)
-PKG_CHECK_MODULES(NOTIFY, libnotify)
 
 dnl **** Check for VTE ****
 PKG_CHECK_MODULES(VTE, vte3 >= 0.25.1, has_vte=yes, has_vte=no)