File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -356,7 +356,7 @@ Merging while the target branch changed
356
356
.......................................
357
357
358
358
Sometimes, someone else merges a PR in ``5.x `` at the same time as you are
359
- doing it. In these cases, ``gh merge ... `` failes to push. Solve this by
359
+ doing it. In these cases, ``gh merge ... `` fails to push. Solve this by
360
360
resetting your local branch and restarting the merge:
361
361
362
362
.. code-block :: terminal
Original file line number Diff line number Diff line change @@ -371,7 +371,7 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
371
371
return function(ContainerConfigurator $configurator) {
372
372
$services = $configurator->services();
373
373
374
- $services->set('app.cace .adapter.redis')
374
+ $services->set('app.cache .adapter.redis')
375
375
->parent('cache.adapter.redis')
376
376
->tag('cache.pool', ['namespace' => 'my_custom_namespace']);
377
377
};
You can’t perform that action at this time.
0 commit comments