Skip to content

Commit e72ce8f

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.5
Conflicts: system/Test/TestResponse.php
2 parents 4658167 + 9894b92 commit e72ce8f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Config/Toolbar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Toolbar extends BaseConfig
4949
* Collect Var Data
5050
* --------------------------------------------------------------------------
5151
*
52-
* If set to false var data from the views will not be colleted. Useful to
52+
* If set to false var data from the views will not be collected. Useful to
5353
* avoid high memory usage when there are lots of data passed to the view.
5454
*/
5555
public bool $collectVarData = true;

system/Test/TestResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function assertOK(): void
159159
}
160160

161161
/**
162-
* Asserts that the Response is considered OK.
162+
* Asserts that the Response is considered not OK.
163163
*/
164164
public function assertNotOK(): void
165165
{

0 commit comments

Comments
 (0)