Skip to content

Commit 2bc25a5

Browse files
committed
Merge branch 'master' into dev
2 parents 1a5fb33 + e5e7439 commit 2bc25a5

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- coverage checks ignored for branches named 'documentation'
99
- switch from Serveo to localtunnel
1010
- increased timeout from 5 to 8 minutes
11+
- generalized some variables such as repo owner, ci context
12+
- updated documentation
1113

1214
## [2.1.0]
1315
### Added
@@ -21,7 +23,11 @@
2123
- suppress warnings about shadowing builtins in runAllTests
2224
- run tests in subfolders
2325
- filter out performance tests
26+
<<<<<<< HEAD
2427
- skip tests for commits to branches named 'documentation'
28+
=======
29+
- skip checks for commits to branches named 'documentation'
30+
>>>>>>> master
2531
2632
## [2.0.0]
2733
### Added

0 commit comments

Comments
 (0)