Skip to content

Commit 8255572

Browse files
committed
Update yarn.lock
Signed-off-by: Bryan Ramos <bramos@redhat.com>
1 parent a123b63 commit 8255572

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

dynamic-plugins/yarn.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6666,6 +6666,7 @@ __metadata:
66666666
languageName: node
66676667
linkType: hard
66686668

6669+
<<<<<<< HEAD
66696670
"@backstage/plugin-kubernetes-react@npm:^0.5.11, @backstage/plugin-kubernetes-react@npm:^0.5.7":
66706671
version: 0.5.11
66716672
resolution: "@backstage/plugin-kubernetes-react@npm:0.5.11"
@@ -6703,6 +6704,8 @@ __metadata:
67036704
languageName: node
67046705
linkType: hard
67056706

6707+
=======
6708+
>>>>>>> 1c75dd52 (Update yarn.lock)
67066709
"@backstage/plugin-kubernetes@npm:0.12.10":
67076710
version: 0.12.10
67086711
resolution: "@backstage/plugin-kubernetes@npm:0.12.10"

0 commit comments

Comments
 (0)