From 17b50c99066a0b8bb9ce2e46b6666da784dc8fbb Mon Sep 17 00:00:00 2001
From: Theo Weijmer <t.weijmer@pensare.nl>
Date: Thu, 31 Oct 2019 14:19:23 +0100
Subject: [PATCH] Merge conflict

---
 application/models/eloquent/queries/QinvoiceMonthOverview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/eloquent/queries/QinvoiceMonthOverview.php b/application/models/eloquent/queries/QinvoiceMonthOverview.php
index b5d167f..fbeaa5e 100644
--- a/application/models/eloquent/queries/QinvoiceMonthOverview.php
+++ b/application/models/eloquent/queries/QinvoiceMonthOverview.php
@@ -33,11 +33,11 @@ class QinvoiceMonthOverview {
                                     GROUP BY    month_id
                                     ) AS PAY
                     ON 				MNT.id = PAY.month_id
-                    JOIN 		    projects   PRJ
+                    LEFT JOIN 		projects   PRJ
                 GROUP BY 			MNT.id
                 ORDER BY            MNT.id ";
 
         return $sql;
     }
 
-}
\ No newline at end of file
+}