@@ -4650,15 +4650,25 @@ __metadata:
4650
4650
languageName: node
4651
4651
linkType: hard
4652
4652
4653
+ <<<<<<< HEAD
4653
4654
"@gravitee/ui-analytics@npm:13.11.0":
4654
4655
version: 13.11.0
4655
4656
resolution: "@gravitee/ui-analytics@npm:13.11.0"
4657
+ =======
4658
+ "@gravitee/ui-analytics@npm:13.12.0":
4659
+ version: 13.12.0
4660
+ resolution: "@gravitee/ui-analytics@npm:13.12.0"
4661
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4656
4662
dependencies:
4657
4663
tslib: "npm:^2.6.2"
4658
4664
peerDependencies:
4659
4665
"@angular/common": ^18.0.0
4660
4666
"@angular/core": ^18.0.0
4667
+ <<<<<<< HEAD
4661
4668
checksum: 10c0/592f0f6e6e716e147a9287d9d35ef2a1ffe60f105826b8cab732215cea2a45359760671d96fb9e8c07d1e30657196ff6fe3395806177adde7ae93255dc380a49
4669
+ =======
4670
+ checksum: 10c0/58d3ca00d6e0e04295bc6eeb4e198b0a5fd23d4dad7c0a94662bf075aea9fdea6e1365b15eac4625fef6c870d722eae787cd19745e56549ba0ab20606bca4ad6
4671
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4662
4672
languageName: node
4663
4673
linkType: hard
4664
4674
@@ -4707,9 +4717,15 @@ __metadata:
4707
4717
languageName: node
4708
4718
linkType: hard
4709
4719
4720
+ <<<<<<< HEAD
4710
4721
"@gravitee/ui-particles-angular@npm:13.11.0":
4711
4722
version: 13.11.0
4712
4723
resolution: "@gravitee/ui-particles-angular@npm:13.11.0"
4724
+ =======
4725
+ "@gravitee/ui-particles-angular@npm:13.12.0":
4726
+ version: 13.12.0
4727
+ resolution: "@gravitee/ui-particles-angular@npm:13.12.0"
4728
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4713
4729
dependencies:
4714
4730
"@fontsource/fira-mono": "npm:4.5.0"
4715
4731
"@fontsource/golos-ui": "npm:^4.5.1"
@@ -4737,13 +4753,23 @@ __metadata:
4737
4753
optional: true
4738
4754
prismjs:
4739
4755
optional: true
4756
+ <<<<<<< HEAD
4740
4757
checksum: 10c0/cb78fffcf3926731648f025883a9b6abfc1497b833a80dd7fe9e0f8c8bfc4cc4764cc794cf1fe9deb0b16b1244ba7909b1aeac4353c571d8650717370dd74ed9
4741
4758
languageName: node
4742
4759
linkType: hard
4743
4760
4744
4761
"@gravitee/ui-policy-studio-angular@npm:13.11.0":
4745
4762
version: 13.11.0
4746
4763
resolution: "@gravitee/ui-policy-studio-angular@npm:13.11.0"
4764
+ =======
4765
+ checksum: 10c0/221117de4040a621958b8056f45ad4c70441b819c261be49155d5616d24c03cbf0ad11605546c1fcb612cb0501187a76a0f05658000c010b18bc804a044eeb9a
4766
+ languageName: node
4767
+ linkType: hard
4768
+
4769
+ "@gravitee/ui-policy-studio-angular@npm:13.12.0":
4770
+ version: 13.12.0
4771
+ resolution: "@gravitee/ui-policy-studio-angular@npm:13.12.0"
4772
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4747
4773
dependencies:
4748
4774
tslib: "npm:^2.6.2"
4749
4775
peerDependencies:
@@ -4755,19 +4781,33 @@ __metadata:
4755
4781
"@angular/material": ^18.0.0
4756
4782
"@gravitee/ui-particles-angular": "*"
4757
4783
lodash: ^4.17.21
4784
+ <<<<<<< HEAD
4758
4785
checksum: 10c0/2d27dee9af5ef179ec5bf2971de3c277eae6404785c4ae41b983fa2deac6934bb2864bacd24794e744ef43099d08da47fa35e3fc35f6946bae52210646154e9c
4759
4786
languageName: node
4760
4787
linkType: hard
4761
4788
4762
4789
"@gravitee/ui-schematics@npm:13.10.2":
4763
4790
version: 13.10.2
4764
4791
resolution: "@gravitee/ui-schematics@npm:13.10.2"
4792
+ =======
4793
+ checksum: 10c0/9a037e5c33bf1f368c1c6e436fb158af99f45527a0e9934b04d39faf4608274c8f793683d7a0625f06a3ea4e34df2da9368541dfac4a9ede4992b46a60d523f1
4794
+ languageName: node
4795
+ linkType: hard
4796
+
4797
+ "@gravitee/ui-schematics@npm:13.12.0":
4798
+ version: 13.12.0
4799
+ resolution: "@gravitee/ui-schematics@npm:13.12.0"
4800
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4765
4801
dependencies:
4766
4802
tslib: "npm:^2.6.3"
4767
4803
peerDependencies:
4768
4804
"@angular/common": ^17.2.0
4769
4805
"@angular/core": ^17.2.0
4806
+ <<<<<<< HEAD
4770
4807
checksum: 10c0/e2fd80ea358ba64f0b2347fa4ed0212c92d464bd33fe0ab6c8013bb1e430fe59b476df43661ffcbdb14e59e1a4eed75834256409b79db1250e455884dc7ef6a6
4808
+ =======
4809
+ checksum: 10c0/095aeb9251f13bf9dca7f50094910283b2682cdf4d9c73eb495185559a25379621d37399446fa5698d179b9bdfdfa01144525b54e3a2389e9d7c9d8e54e55f17
4810
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
4771
4811
languageName: node
4772
4812
linkType: hard
4773
4813
@@ -15163,12 +15203,21 @@ __metadata:
15163
15203
"@asyncapi/web-component": "npm:2.5.1"
15164
15204
"@danielmoncada/angular-datetime-picker": "npm:17.0.0"
15165
15205
"@danielmoncada/angular-datetime-picker-moment-adapter": "npm:4.0.0"
15206
+ <<<<<<< HEAD
15166
15207
"@fontsource/libre-franklin": "npm:4.5.11"
15167
15208
"@gravitee/ui-analytics": "npm:13.11.0"
15168
15209
"@gravitee/ui-components": "npm:4.3.0"
15169
15210
"@gravitee/ui-particles-angular": "npm:13.11.0"
15170
15211
"@gravitee/ui-policy-studio-angular": "npm:13.11.0"
15171
15212
"@gravitee/ui-schematics": "npm:13.10.2"
15213
+ =======
15214
+ "@fontsource/libre-franklin": "npm:4.4.5"
15215
+ "@gravitee/ui-analytics": "npm:13.12.0"
15216
+ "@gravitee/ui-components": "npm:4.2.5"
15217
+ "@gravitee/ui-particles-angular": "npm:13.12.0"
15218
+ "@gravitee/ui-policy-studio-angular": "npm:13.12.0"
15219
+ "@gravitee/ui-schematics": "npm:13.12.0"
15220
+ >>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
15172
15221
"@highcharts/map-collection": "npm:1.1.4"
15173
15222
"@ngx-formly/core": "npm:6.3.0"
15174
15223
"@ngx-formly/material": "npm:6.3.0"
0 commit comments