# HG changeset patch
# User Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
# Date 1469798146 -7200
# Node ID 2bfbab23b524c7c687fee1c0cd45a1465ae79763
# Parent  faa3b3159f0b830589594ab732e285f05e70579b
fixing tag value in the merge tool

diff -r faa3b3159f0b -r 2bfbab23b524 src/iconolab/templates/iconolab/merge_revision.html
--- a/src/iconolab/templates/iconolab/merge_revision.html	Thu Jul 28 17:33:33 2016 +0200
+++ b/src/iconolab/templates/iconolab/merge_revision.html	Fri Jul 29 15:15:46 2016 +0200
@@ -188,7 +188,7 @@
             &nbsp;
             <a  @click="pickTag($event, 'parent-tags')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-left" aria-hidden="true"></i></a>
             <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
-            <typeahead ref="parent-tags" read-only="1" id="merge-parent-revision-tags" :tags="{{ current_tags_data  }}"></typeahead>
+            <typeahead ref="parent-tags" read-only="1" id="merge-parent-revision-tags" :tags="{{ parent_tags_data  }}"></typeahead>
           </fieldset>
 
           <fieldset>