From 6e46d718f7734270c7a38483fbc8510b67c33318 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Tue, 27 Aug 2013 18:22:02 +0200
Subject: [PATCH] // Fix merge problem

---
 .../default/template/helpers/form/form.tpl    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 84d1f2a4f..08bf0773d 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -339,8 +339,6 @@
 											</div>
 										{/if}
 									{/if}
-<<<<<<< HEAD
-
 									<div class="col-lg-7">
 										<div class="row">
 											<div class="col-lg-8">
@@ -370,23 +368,6 @@
 											});
 										});
 									</script>
-
-=======
-									
-									{if isset($input.lang) AND $input.lang}
-										<div class="translatable">
-											{foreach $languages as $language}
-												<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-													<input type="file" name="{$input.name}_{$language.id_lang}" {if isset($input.id)}id="{$input.id}_{$language.id_lang}"{/if} />
-									
-												</div>
-											{/foreach}
-										</div>
-									{else}
-										<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
-									{/if}
-									{if !empty($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
->>>>>>> f610b0d844c37cc9b1dc1b94c17f3d0e5a3ca21a
 								{elseif $input.type == 'password'}
 									<input type="password"
 											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"