Skip to content

Commit 33858c5

Browse files
committed
Merge remote-tracking branch 'origin/master'
Resolve package-lock.json conflict by keeping newer botasaurus-server v4.1.146
2 parents 184d49b + a28bb48 commit 33858c5

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "todo-my-app-name",
3-
"version": "1.45.0",
3+
"version": "1.46.0",
44
"description": "Todo my app description",
55
"license": "MIT",
66
"main": "./dist/main/main.js",

0 commit comments

Comments
 (0)