[gnome-disk-utility] Fixup for the previous commit

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ec3f5ebf55aef1753c722b393debd2cf0660a8fa
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Mar 26 22:46:55 2015 -0500

    Fixup for the previous commit
    
    I forgot to save the file after fixing the merge conflict. D'oh.

 configure.ac |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 52460a8..8323043 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,13 +115,8 @@ PKG_CHECK_MODULES(LIBSECRET1, [libsecret-1 >= $LIBSECRET1_REQUIRED])
 PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED])
 PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED])
 PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED])
-<<<<<<< HEAD
-PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED])
 PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
 PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED])
-=======
-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= LIBNOTIFY_REQUIRED])
->>>>>>> Avoid needing gsd during build when --disable-gsd-plugin is used
 
 gsd_plugindir='${libdir}/gnome-settings-daemon-3.0'
 AC_SUBST([gsd_plugindir])