[tali/mallard-help] Fix build

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d1f93a402cd24bba567bb15bf5ef5094f751f801
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Jul 8 14:33:27 2014 -0500

    Fix build

 configure.ac |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bec0e79..6e0c786 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,5 @@
 AC_PREREQ([2.63])
-<<<<<<< HEAD
 AC_INIT([Tali], [3.13.1], [https://bugzilla.gnome.org/],
-=======
-<<<<<<< HEAD
-AC_INIT([Tali], [3.12.2], [https://bugzilla.gnome.org/],
-=======
-AC_INIT([Tali], [3.13.1], [https://bugzilla.gnome.org/],
->>>>>>> Prepare 3.13.1
->>>>>>> Prepare 3.13.1
         [tali], [https://wiki.gnome.org/Apps/Tali])
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])