Skip to content

Commit

Permalink
build: remove merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ashley-hunter committed Dec 9, 2024
1 parent 0d2ca01 commit 1bd4484
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 25 deletions.
1 change: 0 additions & 1 deletion libs/ui/breadcrumb/helm/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable */
export default {
displayName: 'ui-breadcrumb-helm',
preset: '../../../../jest.preset.cjs',
Expand Down
20 changes: 10 additions & 10 deletions libs/ui/pagination/helm/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"name": "@spartan-ng/ui-pagination-helm",
"version": "0.0.1-alpha.357",
"sideEffects": false,
"peerDependencies": {
"@spartan-ng/ui-core": "0.0.1-alpha.357",
"@spartan-ng/ui-select-brain": "0.0.1-alpha.357",
"@spartan-ng/ui-icon-helm": "0.0.1-alpha.357",
"@spartan-ng/ui-button-helm": "0.0.1-alpha.357",
"@angular/core": ">=18.0.0",
"@angular/cdk": ">=18.0.0",
"@angular/core": ">=18.0.0",
"@angular/forms": ">=18.0.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"@angular/router": ">=18.0.0",
"@ng-icons/lucide": ">=29.0.0",
"@angular/router": ">=18.0.0"
"@spartan-ng/ui-button-helm": "0.0.1-alpha.357",
"@spartan-ng/ui-core": "0.0.1-alpha.357",
"@spartan-ng/ui-icon-helm": "0.0.1-alpha.357",
"@spartan-ng/ui-select-brain": "0.0.1-alpha.357",
"@spartan-ng/ui-select-helm": "0.0.1-alpha.357",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1"
},
"dependencies": {},
"sideEffects": false,
"publishConfig": {
"access": "public"
}
Expand Down
18 changes: 9 additions & 9 deletions libs/ui/select/helm/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@spartan-ng/ui-select-helm",
"version": "0.0.1-alpha.357",
"sideEffects": false,
"dependencies": {},
"peerDependencies": {
"@spartan-ng/ui-core": "0.0.1-alpha.357",
"@spartan-ng/ui-select-brain": "0.0.1-alpha.357",
"@spartan-ng/ui-icon-helm": "0.0.1-alpha.357",
"@angular/core": ">=18.0.0",
"clsx": "^2.1.1",
"@ng-icons/lucide": ">=29.0.0",
"@ng-icons/core": ">=29.0.0",
"class-variance-authority": "^0.7.0"
},
"dependencies": {},
"sideEffects": false
"@ng-icons/lucide": ">=29.0.0",
"@spartan-ng/ui-core": "0.0.1-alpha.357",
"@spartan-ng/ui-icon-helm": "0.0.1-alpha.357",
"@spartan-ng/ui-select-brain": "0.0.1-alpha.357",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1"
}
}
10 changes: 5 additions & 5 deletions libs/ui/slider/brain/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@spartan-ng/ui-slider-brain",
"version": "0.0.1-alpha.357",
"sideEffects": false,
"dependencies": {},
"peerDependencies": {
"@angular/cdk": ">=18.0.0",
"@angular/common": ">=18.0.0",
"@angular/core": ">=18.0.0",
"@angular/cdk": ">=18.0.0",
"@angular/forms": ">=18.0.0",
"rxjs": ">=6.6.0",
"@spartan-ng/brain": "0.0.1-alpha.357"
"@spartan-ng/brain": "0.0.1-alpha.357",
"rxjs": ">=6.6.0"
},
"dependencies": {},
"sideEffects": false,
"publishConfig": {
"access": "public"
}
Expand Down

0 comments on commit 1bd4484

Please sign in to comment.