From 173e57342d4d98e266cbedf811f19ea30b2f4cf8 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 30 Jun 2014 22:36:36 +0200
Subject: [PATCH] [TAG] create 1.2-dev tag

---
 sources/tag | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sources/tag b/sources/tag
index 8cfbc90..ca97c40 100644
--- a/sources/tag
+++ b/sources/tag
@@ -1 +1,5 @@
-1.1.1
\ No newline at end of file
+<<<<<<< HEAD
+1.1.1
+=======
+1.2-dev
+>>>>>>> 2939038... [TAG] create 1.2-dev tag