Skip to content

Commit

Permalink
fix: 馃悰 F枚rb盲ttrad markdown-parsning
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanObrink authored and viktorlarsson committed Apr 28, 2021
1 parent 9671fa2 commit 9546540
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 3 additions & 2 deletions packages/app/package.json
Expand Up @@ -25,8 +25,9 @@
"@react-navigation/bottom-tabs": "5.11.9",
"@react-navigation/native": "5.9.4",
"@react-navigation/stack": "5.14.4",
"@skolplattformen/api-hooks": "2.1.1",
"@skolplattformen/embedded-api": "4.4.1",
"@skolplattformen/api-hooks": "3.0.0",
"@skolplattformen/curriculum": "1.4.0",
"@skolplattformen/embedded-api": "5.1.1",
"@ui-kitten/components": "5.0.0",
"@ui-kitten/eva-icons": "5.0.0",
"buffer": "6.0.3",
Expand Down
7 changes: 7 additions & 0 deletions packages/app/yarn.lock
Expand Up @@ -1507,10 +1507,17 @@
integrity sha512-QZDRCgs2nXyAOpN4IwnfGNsa5ejlfyej+L1DBq6hA/VEpijdFydKmxmJVdty7jRd9cH4aklbE5rCfXAuVaWIGg==
>>>>>>> feat: 馃幐 Polish support in curriculum

<<<<<<< HEAD
"@skolplattformen/embedded-api@4.4.1":
version "4.4.1"
resolved "https://registry.yarnpkg.com/@skolplattformen/embedded-api/-/embedded-api-4.4.1.tgz#c8802c0f8bcf208dbf1ba9c67d3a9a3a156ce7f6"
integrity sha512-2+MTs0AK0Qe9vPRyC0P2Y7/kh6QWk40rXh+VQ9e5vRakYIflbNDpdFg7Jo6ULkebF92eG+XnQlzj0QgCmlx0mg==
=======
"@skolplattformen/embedded-api@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@skolplattformen/embedded-api/-/embedded-api-5.1.1.tgz#4a38cc3e4638355cbe5d0072a9b7e463d041014b"
integrity sha512-XeMuT5kWXIbk4fcl/ZYKQfSxUe9vBfuzLpll8qWrsf1lcwA3S5HgMoGIDmm1Govq75EeavHFZyJL5f/amBNoVg==
>>>>>>> fix: 馃悰 F枚rb盲ttrad markdown-parsning
dependencies:
"@types/he" "^1.1.1"
camelcase-keys "^6.2.2"
Expand Down

0 comments on commit 9546540

Please sign in to comment.