We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent a123b63 commit 8255572Copy full SHA for 8255572
dynamic-plugins/yarn.lock
@@ -6666,6 +6666,7 @@ __metadata:
6666
languageName: node
6667
linkType: hard
6668
6669
+<<<<<<< HEAD
6670
"@backstage/plugin-kubernetes-react@npm:^0.5.11, @backstage/plugin-kubernetes-react@npm:^0.5.7":
6671
version: 0.5.11
6672
resolution: "@backstage/plugin-kubernetes-react@npm:0.5.11"
@@ -6703,6 +6704,8 @@ __metadata:
6703
6704
6705
6706
6707
+=======
6708
+>>>>>>> 1c75dd52 (Update yarn.lock)
6709
"@backstage/plugin-kubernetes@npm:0.12.10":
6710
version: 0.12.10
6711
resolution: "@backstage/plugin-kubernetes@npm:0.12.10"
0 commit comments