Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
irina060981 committed May 4, 2022
1 parent f045660 commit 2866ede
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"name": "alpheios-embedded",
<<<<<<< HEAD
"version": "3.4.5",
=======
"version": "3.4.2-incr-3.4.x.20220504210",
>>>>>>> e7f022a6adfb60c326eb5f7aecf643a99e521588
"description": "Alpheios Embedded Library",
"main": "dist/alpheios-embedded.js",
"directories": {
Expand Down

0 comments on commit 2866ede

Please sign in to comment.