From c8397484e662dcc90de81f13da0620748f28b4c0 Mon Sep 17 00:00:00 2001
From: Dave M <info@mcnd.ca>
Date: Tue, 6 Oct 2020 18:06:44 +0000
Subject: [PATCH] - Fixed missed file conflict

---
 src/Query/Where.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Query/Where.php b/src/Query/Where.php
index 0db41c1..78ee819 100644
--- a/src/Query/Where.php
+++ b/src/Query/Where.php
@@ -67,11 +67,7 @@ class Where extends Fragment {
         }
 
         return $this->renderSegments([
-
-            ! $this->parent && ! empty($this->conditionList) ? static::SQL_TOKEN : "",
-=======
-            ! $this->parent && ! $skipToken ? static::SQL_TOKEN : "",
->>>>>>> 27d5fd0b08b98f6fda3b8a6682b2dd7c7a692d82
+            ! $this->parent && ! $skipToken && ! empty($this->conditionList) ? static::SQL_TOKEN : "",
             implode(" ", $stack)
         ]);
     }