mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
resolve conflict
This commit is contained in:
@@ -270,7 +270,8 @@
|
||||
<tr>
|
||||
<td style="text-align:right; width:80px;"><span class="label"></span> : </td>
|
||||
<td></td>
|
||||
<td><input type="text" style="width:250px;" name="term" onkeyup="inputChanged();return(false);"></td>
|
||||
<td><input type="text" style="width:250px;" name="term"
|
||||
onkeyup="inputChanged();return(false);"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align:right">{{ 'thesaurus:: contexte' | trans }} : </td>
|
||||
|
Reference in New Issue
Block a user