Skip to content

Commit c10666c

Browse files
authored
fix: docs (#3193)
1 parent 48e1e23 commit c10666c

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

docs/advanced.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ Scenario('update user profile', ({ }) => {
100100
All tests with `@tag` could be executed with `--grep '@tag'` option.
101101
102102
```sh
103-
<<<<<<< HEAD
104-
npx codeceptjs run --grep @slow
105-
=======
106103
codeceptjs run --grep '@slow'
107-
>>>>>>> 435964dff7770cb3cd58c78a8579b6221a000d24
108104
```
109105
110106
Use regex for more flexible filtering:

docs/plugins.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ If a session expires automatically logs in again.
127127
```js
128128
// inside a test file
129129
// use login to inject auto-login function
130-
<<<<<<< HEAD
131130
Before(({ login }) => {
132-
=======
133-
Before( ({login}) => {
134-
>>>>>>> 435964dff7770cb3cd58c78a8579b6221a000d24
135131
login('user'); // login using user session
136132
});
137133

0 commit comments

Comments
 (0)