Skip to content

Commit 2c8d00f

Browse files
committed
Merge branch 'refs/heads/combine-order'
2 parents f922732 + 7e306e1 commit 2c8d00f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/core/src/main/scala/org/scalasteward/core/repoconfig/RepoConfigAlg.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class RepoConfigAlg[F[_]](maybeGlobalRepoConfig: Option[RepoConfig])(impli
3232
F: MonadThrow[F]
3333
) {
3434
def mergeWithGlobal(maybeRepoConfig: Option[RepoConfig]): RepoConfig =
35-
(maybeRepoConfig |+| maybeGlobalRepoConfig).getOrElse(RepoConfig.empty)
35+
(maybeGlobalRepoConfig |+| maybeRepoConfig).getOrElse(RepoConfig.empty)
3636

3737
def readRepoConfig(repo: Repo): F[ConfigParsingResult] =
3838
for {

0 commit comments

Comments
 (0)