Skip to content

Commit 22f7626

Browse files
HoloRinmergify[bot]
authored andcommitted
Use the new branch name for looking_glass
(cherry picked from commit 27e8fa8) (cherry picked from commit eecce51) (cherry picked from commit 930cf82) # Conflicts: # rabbitmq-components.mk
1 parent 77785ec commit 22f7626

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

rabbitmq-components.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,15 @@ dep_toke = git_rmq toke $(current_rmq_ref
112112

113113
dep_accept = hex 0.3.5
114114
dep_cowboy = hex 2.8.0
115+
<<<<<<< HEAD
115116
dep_cowlib = hex 2.9.1
116117
dep_jsx = hex 3.1.0
117118
dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
119+
=======
120+
dep_cowlib = hex 2.12.1
121+
dep_credentials_obfuscation = hex 3.4.0
122+
dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
123+
>>>>>>> 930cf82a1a (Use the new branch name for looking_glass)
118124
dep_prometheus = hex 4.10.0
119125
dep_ra = hex 2.4.6
120126
dep_ranch = hex 2.1.0

0 commit comments

Comments
 (0)