Skip to content

Commit 6a5f9c2

Browse files
mkurzmergify[bot]
authored andcommitted
Pin hibernate
(cherry picked from commit a8bef24) # Conflicts: # .github/scala-steward.conf
1 parent 4cd8147 commit 6a5f9c2

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

.github/scala-steward.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ updates.pin = [
3333
{ groupId = "org.webjars", artifactId = "bootstrap", version = "3.4." },
3434
{ groupId = "com.google.inject", artifactId = "guice", version = "6.0." },
3535
{ groupId = "net.codingwell", artifactId = "scala-guice", version = "6.0." },
36+
<<<<<<< HEAD
3637
{ groupId = "org.playframework", artifactId = "play-slick", version = "6." },
3738
{ groupId = "org.playframework", artifactId = "play-slick-evolutions", version = "6." }
39+
=======
40+
{ groupId = "com.typesafe.play", artifactId = "play-slick", version = "5." },
41+
{ groupId = "com.typesafe.play", artifactId = "play-slick-evolutions", version = "5." },
42+
{ groupId = "org.hibernate", artifactId = "hibernate-core", version = "6." }
43+
>>>>>>> a8bef245 (Pin hibernate)
3844
]
3945

4046
buildRoots = [

0 commit comments

Comments
 (0)