From 14625f4cbfef3c08dece04ecc8f7818d987f4ad9 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 4 Mar 2012 19:55:30 +0100 Subject: [PATCH] Removes leftovers from conflict resolution --- wcfsetup/install/files/acp/templates/packageView.tpl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index d66141cc0c..b1bdfaaace 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -153,17 +153,10 @@ {/if} -<<<<<<< HEAD -

{$requiredPackage->packageName}{if $requiredPackage->instanceNo > 1 && $requiredPackage->instanceName == ''} (#{#$requiredPackage->instanceNo}){/if}

+

{$requiredPackage->packageName|language}{if $requiredPackage->instanceNo > 1 && $requiredPackage->instanceName == ''} (#{#$requiredPackage->instanceNo}){/if}

{if $requiredPackage->authorURL}

{$requiredPackage->author}{else}{$requiredPackage->author}

{/if}

{$requiredPackage->packageVersion}

{@$requiredPackage->packageDate|date}

-======= -

{$requiredPackage.packageName|language}{if $requiredPackage.instanceNo > 1 && $requiredPackage.instanceName == ''} (#{#$requiredPackage.instanceNo}){/if}

- {if $requiredPackage.authorURL}

{$requiredPackage.author}{else}{$requiredPackage.author}

{/if} -

{$requiredPackage.packageVersion}

-

{@$requiredPackage.packageDate|date}

->>>>>>> Localized package infos stay localized after installation {event name='requirementColumns'} -- 2.20.1