Skip to content

Commit

Permalink
scalafmt
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Aug 11, 2024
1 parent ab1bdf3 commit 9ff0ccd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ enablePlugins(PekkoGrpcPlugin)

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("META-INF", "versions", _*) => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enablePlugins(PekkoGrpcPlugin)

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("google", "protobuf", _*) => MergeStrategy.discard
case PathList("META-INF", "versions", _*) => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
Expand Down

0 comments on commit 9ff0ccd

Please sign in to comment.