Skip to content

Commit

Permalink
fix(conflcit): resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Shubham Sharma - s0s0p6u authored and Shubham Sharma - s0s0p6u committed Nov 16, 2023
2 parents 9c6957b + 4fe5bd8 commit 6a41077
Show file tree
Hide file tree
Showing 35 changed files with 2,539 additions and 2,658 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x, 16.x, 18.x]
node-version: [14.x, 16.x, 18.x]

steps:
- uses: actions/checkout@v3
Expand Down

This file was deleted.

10 changes: 0 additions & 10 deletions common/changes/@xarc/app/release-08-29-2023_2023-08-29-22-10.json

This file was deleted.

This file was deleted.

16 changes: 16 additions & 0 deletions common/changes/@xarc/webpack/master_2023-10-31-04-39.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"changes": [
{
"changeType": 1,
"comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
"packageName": "@xarc/webpack"
},
{
"changeType": 1,
"comment": "Dependency @xarc/app-dev version bump from ^11.0.5 to ^11.0.6.",
"packageName": "@xarc/webpack"
}
],
"packageName": "@xarc/webpack",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/subapp-pbundle/master_2023-10-31-04-39.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"changeType": 1,
"comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
"packageName": "subapp-pbundle"
}
],
"packageName": "subapp-pbundle",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/subapp-react/master_2023-10-31-04-39.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"changeType": 1,
"comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
"packageName": "subapp-react"
}
],
"packageName": "subapp-react",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/subapp-web/master_2023-10-31-04-39.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"changeType": 1,
"comment": "Dependency @xarc/app version bump from ^11.0.5 to ^11.0.6.",
"packageName": "subapp-web"
}
],
"packageName": "subapp-web",
"email": "[email protected]"
}
Loading

0 comments on commit 6a41077

Please sign in to comment.