diff options
| author | Nicolas Paul <n@nc0.fr> | 2024-03-04 09:40:46 +0100 |
|---|---|---|
| committer | Nicolas Paul <n@nc0.fr> | 2024-03-04 09:40:46 +0100 |
| commit | 716bebd16b96cfa3c7a0623729ea20794794a4ed (patch) | |
| tree | 61911098be1850e1cf71f83aa4cd96e7162f86b8 | |
| parent | de485dc2729d1e9e10331c41200e8352fc20bf8f (diff) | |
| parent | 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 (diff) | |
Merge branch 'master' of github.com:nc0fr/life2
| -rw-r--r-- | build/.keep | 0 | ||||
| -rw-r--r-- | ci/.keep | 0 | ||||
| -rw-r--r-- | infra/.keep | 0 | ||||
| -rw-r--r-- | life2/simulator/package.json | 4 | ||||
| -rw-r--r-- | package-lock.json | 20 |
5 files changed, 24 insertions, 0 deletions
diff --git a/build/.keep b/build/.keep deleted file mode 100644 index e69de29..0000000 --- a/build/.keep +++ /dev/null diff --git a/ci/.keep b/ci/.keep deleted file mode 100644 index e69de29..0000000 --- a/ci/.keep +++ /dev/null diff --git a/infra/.keep b/infra/.keep deleted file mode 100644 index e69de29..0000000 --- a/infra/.keep +++ /dev/null diff --git a/life2/simulator/package.json b/life2/simulator/package.json index 7c5e4af..859dea9 100644 --- a/life2/simulator/package.json +++ b/life2/simulator/package.json @@ -33,6 +33,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { +<<<<<<< HEAD +======= + "typescript": "5.3.3", +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "webpack": "5.90.3", "webpack-cli": "5.1.4" } diff --git a/package-lock.json b/package-lock.json index 66b8d65..c9f399c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,10 @@ "version": "1.0.0", "license": "SEE LICENSE IN COPYRIGHT", "devDependencies": { +<<<<<<< HEAD +======= + "typescript": "5.3.3", +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "webpack": "5.90.3", "webpack-cli": "5.1.4" }, @@ -1174,6 +1178,22 @@ } } }, +<<<<<<< HEAD +======= + "node_modules/typescript": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, +>>>>>>> 2ec513dd3a4e416d1acf3e8c573f52896d1bf764 "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", |