Skip to content

Commit b43c58b

Browse files
committed
Merge branches 'feature/angular9' and 'master' of https://github.com/kreuzerk/ng-sortgrid into feature/angular9
� Conflicts: � package-lock.json � package.json
2 parents a0a1431 + 3b8b074 commit b43c58b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.travis.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@ node_js:
77
os:
88
- linux
99
addons:
10-
apt:
11-
sources:
12-
- google-chrome
13-
packages:
14-
- google-chrome-stable
15-
before_install:
16-
- export CHROME_BIN=chromium-browser
17-
- export DISPLAY=:99.0
18-
- sh -e /etc/init.d/xvfb start
10+
chrome: stable
1911

2012
jobs:
2113
include:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@types/jasmine": "~2.8.8",
4949
"@types/jasminewd2": "~2.0.3",
5050
"@types/node": "^12.11.1",
51-
"codecov": "^3.3.0",
51+
"codecov": "^3.6.5",
5252
"codelyzer": "^5.1.2",
5353
"copyfiles": "^2.1.0",
5454
"husky": "^1.3.1",

0 commit comments

Comments
 (0)