resolve merge conflict

alpheios-project · May 4, 2022 · f045660 · f045660
2 parents d39dd50 + e7f022a
commit f045660
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 40,166 deletions.
diff --git a/dist/alpheios-embedded.js b/dist/alpheios-embedded.js
diff --git a/dist/alpheios-embedded.js.map b/dist/alpheios-embedded.js.map