From eb92f617b57c50ab8f5b258febb35e14ffb542b7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 23 Jan 2017 22:14:07 +0200
Subject: [PATCH] Fix for merge

---
 app/Models/Invoice.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 4c16459a11bd..16929178c816 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -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
     }
 
     /**