1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00

Fix for merge

This commit is contained in:
Hillel Coren 2017-01-23 22:14:07 +02:00
parent 7a744680ae
commit eb92f617b5

View File

@ -643,7 +643,6 @@ class Invoice extends EntityModel implements BalanceAffecting
public function statusLabel()
{
return static::calcStatusLabel($this->invoice_status->name, $this->statusClass(), $this->getEntityType(), $this->quote_invoice_id);
>>>>>>> release-3.0.0
}
/**