mcndave
/
ulmus
1
0
Fork 0
Code Issues 16 Pull Requests Projects 1 Releases Wiki Activity

- Fixed missed file conflict

This commit is contained in:
Dave M. 2020-10-06 18:06:44 +00:00
parent 6f558f2923
commit c8397484e6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Query/Where.php
View File

@ -67,11 +67,7 @@ class Where extends Fragment {
} }
return $this->renderSegments([ return $this->renderSegments([
! $this->parent && ! $skipToken && ! empty($this->conditionList) ? static::SQL_TOKEN : "",
! $this->parent && ! empty($this->conditionList) ? static::SQL_TOKEN : "",
=======
! $this->parent && ! $skipToken ? static::SQL_TOKEN : "",
>>>>>>> 27d5fd0b08b98f6fda3b8a6682b2dd7c7a692d82
implode(" ", $stack) implode(" ", $stack)
]); ]);
} }