From 2866ede51a957443791a353f55731a379231cdfa Mon Sep 17 00:00:00 2001
From: Irina <irina060981@yandex.ru>
Date: Wed, 4 May 2022 17:08:34 +1000
Subject: [PATCH] resolve merge conflict

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 3667d30..575b677 100644
--- a/package.json
+++ b/package.json
@@ -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": {