[tali/mallard-help: 30/31] Prepare 3.13.1

[Rashi Aswani <aswanirashi src gnome org>]

commit b4e7ae46099fdf7db574bd03a7fc540748798fcb
Author: Mario Wenzel <maweki gmail com>
Date:   Tue Apr 29 12:58:44 2014 +0200

    Prepare 3.13.1

 NEWS         |    7 +------
 configure.ac |    8 ++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/NEWS b/NEWS
index e0540b4..e497234 100644
--- a/NEWS
+++ b/NEWS
@@ -1,22 +1,17 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 Tali 3.13.1
 ===========
 
 * Translation updates (Basque, Slovenian, Greek)
-=======
-=======
+
 Tali 3.12.2
 ===========
 
 * Translation updates (Catalan (Valencian), Indonesian, Catalan, Greek)
 
->>>>>>> 3.12.2
 Tali 3.12.1
 ===========
 
 * Translation updates (Basque, Slovenian)
->>>>>>> Prepare 3.12.1
 
 Tali 3.12.0
 ===========
diff --git a/configure.ac b/configure.ac
index 6e0c786..bec0e79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,13 @@
 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])