From 53111d75848f6d0711fb615759c9e7a4b70588f3 Mon Sep 17 00:00:00 2001 From: Fabian Marz Date: Wed, 18 Feb 2015 22:59:46 +0100 Subject: [PATCH] Merge conflict --- app/views/clients/show.blade.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/clients/show.blade.php b/app/views/clients/show.blade.php index 1f8c4aef1709..00fa2f8e6255 100755 --- a/app/views/clients/show.blade.php +++ b/app/views/clients/show.blade.php @@ -10,15 +10,12 @@ {{ Former::text('id')->value($client->public_id) }} -<<<<<<< HEAD @if ($gatewayLink) {{ Button::link($gatewayLink, trans('texts.view_in_stripe'), ['target' => '_blank']) }} @endif - @if ($client->trashed()) -======= @if ($client->trashed()) ->>>>>>> Added translation string and fixed german string + @if ($client->trashed()) {{ Button::primary(trans('texts.restore_client'), ['onclick' => 'onRestoreClick()']) }} @else {{ DropdownButton::normal(trans('texts.edit_client'),