Skip to content

Commit 6fabc91

Browse files
committed
Merge remote-tracking branch 'origin/renovate/privyid-pena-angular-0.x' into main
1 parent 664f145 commit 6fabc91

2 files changed

Lines changed: 5 additions & 8586 deletions

File tree

example-angular/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@
1919
"@angular/platform-browser": "^15.1.0",
2020
"@angular/platform-browser-dynamic": "^15.1.0",
2121
"@angular/router": "^15.1.0",
22+
<<<<<<< HEAD
2223
"@privyid/pena": "^0.3.0",
2324
"@privyid/pena-angular": "^0.1.0",
25+
=======
26+
"@privyid/pena": "^0.0.1",
27+
"@privyid/pena-angular": "^0.3.0",
28+
>>>>>>> privyid-pena-angular-0.x
2429
"rxjs": "~7.8.0",
2530
"tslib": "^2.3.0",
2631
"zone.js": "~0.12.0"

0 commit comments

Comments
 (0)