Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
Fabian Marz 2015-02-18 22:59:46 +01:00
parent 897277831a
commit 53111d7584
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/clients/show.blade.php
View File

@ -10,15 +10,12 @@
{{ Former::text('id')->value($client->public_id) }} {{ Former::text('id')->value($client->public_id) }}
</div> </div>
<<<<<<< HEAD
@if ($gatewayLink) @if ($gatewayLink)
{{ Button::link($gatewayLink, trans('texts.view_in_stripe'), ['target' => '_blank']) }} {{ Button::link($gatewayLink, trans('texts.view_in_stripe'), ['target' => '_blank']) }}
@endif @endif
@if ($client->trashed())
=======
@if ($client->trashed()) @if ($client->trashed())
>>>>>>> Added translation string and fixed german string @if ($client->trashed())
{{ Button::primary(trans('texts.restore_client'), ['onclick' => 'onRestoreClick()']) }} {{ Button::primary(trans('texts.restore_client'), ['onclick' => 'onRestoreClick()']) }}
@else @else
{{ DropdownButton::normal(trans('texts.edit_client'), {{ DropdownButton::normal(trans('texts.edit_client'),