resolve merge conflict

alpheios-project · Apr 18, 2022 · 4856520 · 4856520
2 parents 9ed85c1 + 0e53ad4
commit 4856520
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 28 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
  "packages": [
  "packages/*"
  ],
- "version": "3.3.3-incr-3.4.x.20211201206"
+ "version": "3.3.3-incr-3.4.x.20220418290"
 }
diff --git a/packages/client-adapters/package-lock.json b/packages/client-adapters/package-lock.json
diff --git a/packages/client-adapters/package.json b/packages/client-adapters/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-client-adapters",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Alpheios Client Adapters Library",
  "private": true,
  "main": "dist/alpheios-client-adapters.min.js",
@@ -34,9 +34,9 @@
  "@babel/plugin-transform-runtime": "^7.12.1",
  "@babel/runtime": "^7.12.5",
  "@vue/test-utils": "^1.1.1",
- "alpheios-data-models": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-data-models": "^3.3.3-incr-3.4.x.20220418290",
  "alpheios-fixtures": "github:alpheios-project/fixtures",
- "alpheios-l10n": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-l10n": "^3.3.3-incr-3.4.x.20220418290",
  "alpheios-messaging": "github:alpheios-project/alpheios-messaging",
  "alpheios-node-build": "github:alpheios-project/node-build#v3",
  "axios": "^0.21.0",

diff --git a/packages/components/dist/alpheios-components.js b/packages/components/dist/alpheios-components.js
diff --git a/packages/components/dist/alpheios-components.min.js b/packages/components/dist/alpheios-components.min.js
diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-components",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Alpheios Components",
  "main": "dist/alpheios-components.min.js",
  "scripts": {
@@ -51,17 +51,17 @@
  "@babel/plugin-transform-runtime": "^7.12.1",
  "@babel/runtime": "^7.12.5",
  "@vue/test-utils": "^1.1.1",
- "alpheios-client-adapters": "^3.3.3-incr-3.4.x.20211201206",
- "alpheios-data-models": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-client-adapters": "^3.3.3-incr-3.4.x.20220418290",
+ "alpheios-data-models": "^3.3.3-incr-3.4.x.20220418290",
  "alpheios-experience": "github:alpheios-project/experience",
  "alpheios-fixtures": "github:alpheios-project/fixtures",
- "alpheios-inflection-tables": "^3.3.3-incr-3.4.x.20211201206",
- "alpheios-l10n": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-inflection-tables": "^3.3.3-incr-3.4.x.20220418290",
+ "alpheios-l10n": "^3.3.3-incr-3.4.x.20220418290",
  "alpheios-language-detect": "github:alpheios-project/language-detect",
  "alpheios-messaging": "github:alpheios-project/alpheios-messaging",
  "alpheios-node-build": "github:alpheios-project/node-build#v3",
- "alpheios-res-client": "^3.3.3-incr-3.4.x.20211201206",
- "alpheios-wordlist": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-res-client": "^3.3.3-incr-3.4.x.20220418290",
+ "alpheios-wordlist": "^3.3.3-incr-3.4.x.20220418290",
  "autoprefixer": "^10.1.0",
  "axios": "^0.21.0",
  "babel-core": "^7.0.0-bridge.0",

diff --git a/packages/data-models/package-lock.json b/packages/data-models/package-lock.json
diff --git a/packages/data-models/package.json b/packages/data-models/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-data-models",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Alpheios Data Models",
  "private": true,
  "main": "dist/alpheios-data-models.min.js",

diff --git a/packages/inflection-tables/package-lock.json b/packages/inflection-tables/package-lock.json
diff --git a/packages/inflection-tables/package.json b/packages/inflection-tables/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-inflection-tables",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Inflection library for an Alpheios project",
  "private": true,
  "main": "dist/alpheios-inflection-tables.min.js",
@@ -43,8 +43,8 @@
  "@babel/plugin-transform-runtime": "^7.12.1",
  "@babel/preset-env": "^7.12.7",
  "@babel/runtime": "^7.12.5",
- "alpheios-client-adapters": "^3.3.3-incr-3.4.x.20211201206",
- "alpheios-data-models": "^3.3.3-incr-3.4.x.20211201206",
+ "alpheios-client-adapters": "^3.3.3-incr-3.4.x.20220418290",
+ "alpheios-data-models": "^3.3.3-incr-3.4.x.20220418290",
  "alpheios-fixtures": "github:alpheios-project/fixtures",
  "alpheios-node-build": "github:alpheios-project/node-build#v3",
  "coveralls": "^3.1.0",

diff --git a/packages/l10n/package-lock.json b/packages/l10n/package-lock.json
diff --git a/packages/l10n/package.json b/packages/l10n/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-l10n",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Alpheios Localization",
  "private": true,
  "main": "dist/alpheios-l10n.min.js",

diff --git a/packages/res-client/package-lock.json b/packages/res-client/package-lock.json
diff --git a/packages/res-client/package.json b/packages/res-client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-res-client",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Alpheios Resource Client Library",
  "private": true,
  "main": "dist/alpheios-res-client.min.js",

diff --git a/packages/wordlist/package-lock.json b/packages/wordlist/package-lock.json
diff --git a/packages/wordlist/package.json b/packages/wordlist/package.json
@@ -1,6 +1,6 @@
 {
  "name": "alpheios-wordlist",
- "version": "3.3.3-incr-3.4.x.20211201206",
+ "version": "3.3.3-incr-3.4.x.20220418290",
  "description": "Word-In-Context List library for an Alpheios project",
  "private": true,
  "main": "dist/alpheios-wordlist.min.js",