update from master

app/Http/Controllers/InvoiceController.php

@@ -124,12 +124,8 @@ class InvoiceController extends BaseController
         $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
         $invoice->due_date = Utils::fromSqlDate($invoice->due_date);
         $invoice->is_pro = $account->isPro();
-<<<<<<< HEAD
-
-=======
         $invoice->invoice_fonts = $account->getFontsData();
 
->>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754
         if ($invoice->invoice_design_id == CUSTOM_DESIGN) {
             $invoice->invoice_design->javascript = $account->custom_design;
         } else {

resources/lang/en/texts.php

@@ -1012,7 +1012,7 @@ return array(
 
     'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',
     'white_label_purchase_link' => 'Purchase a white label license',
-<<<<<<< HEAD
+
 
     // Expense / vendor
     'expense' => 'Expense',
@@ -1061,8 +1061,7 @@ return array(
     'edit_payment_terms' => 'Edit payment term',
     'edit_payment_term' => 'Edit payment term',
     'archive_payment_term' => 'Archive payment term',
-);
-=======
+
 
     // recurring due dates
     'recurring_due_dates' => 'Recurring Invoice Due Dates',
@@ -1106,4 +1105,4 @@ return array(
     'payment_message_button' => 'Thank you for your payment of :amount.',
     
 );
->>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754
+

resources/views/invoices/edit.blade.php

@@ -892,9 +892,6 @@
         @endif
 
         applyComboboxListeners();
-<<<<<<< HEAD
-	});
-=======
 	});
 
     function onFrequencyChange(){
@@ -914,7 +911,6 @@
             $('#recurring_due_date').val('');
         }
     }
->>>>>>> cf24684adbce402f1c0e266672c4a2a5767dc754
 
 	function applyComboboxListeners() {
         var selectorStr = '.invoice-table input, .invoice-table textarea';