Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rsimon committed Sep 17, 2022
1 parent de8138a commit 84d8a4e
Showing 2 changed files with 15 additions and 49 deletions.
62 changes: 14 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
"openseadragon": "^3.0.0"
},
"dependencies": {
"@recogito/annotorious": "2.7.7",
"@recogito/annotorious": "2.7.8",
"@recogito/recogito-client-core": "^1.7.7",
"preact": "^10.5.13",
"rbush": "^3.0.1",

0 comments on commit 84d8a4e

Please sign in to comment.