[tali/mallard-help: 4/31] Prepare 3.12.1

[Rashi Aswani <aswanirashi src gnome org>]

commit 4f0b1408cbf619a8b8f5932506a5433e2bf02275
Author: Mario Wenzel <maweki gmail com>
Date:   Mon Apr 14 22:55:28 2014 +0200

    Prepare 3.12.1

 NEWS |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8c43c7e..4bd832b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
 Tali 3.13.1
 ===========
 
 * Translation updates (Basque, Slovenian, Greek)
+=======
+Tali 3.12.1
+===========
+
+* Translation updates (Basque, Slovenian)
+>>>>>>> Prepare 3.12.1
 
 Tali 3.12.0
 ===========