summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 21:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 21:08:59 +0000
commitd466ee5042520ad078fe050cb078d81dc2ebe196 (patch)
tree5648eb1aee8aeff5b5c5ff4669a184fd7676f778 /package.json
parent6a9d7c009e4e5975a89bcc3e458da4b3ec484bd1 (diff)
downloadgitlab-ce-d466ee5042520ad078fe050cb078d81dc2ebe196.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'package.json')
-rw-r--r--package.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/package.json b/package.json
index b6c2d56ca0a..3a5f4edb4ef 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,6 @@
"yarn-deduplicate": "^1.1.1"
},
"resolutions": {
- "at.js": "https://gitlab.com/gitlab-org/frontend/At.js.git#121ce9a557b51c33f5693ac8df52d2bda1e53cbe",
"vue-jest/ts-jest": "24.0.0",
"monaco-editor": "0.18.1"
},