From b3edb6a405a10787839b2eef04d124b002b84202 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Thu, 23 May 2024 17:04:26 +0200
Subject: [PATCH] Fix merge

---
 .scalafmt.conf                                     |  2 --
 .../ivyint/ErrorMessageAuthenticator.scala         | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 36996af92..dfdd36b0b 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -22,5 +22,3 @@ align.openParenDefnSite = false
 danglingParentheses.preset = true
 
 trailingCommas = preserve
-
-runner.dialect = Scala212Source3
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
index f9f6ec04e..478462e8d 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
@@ -64,12 +64,14 @@ object ErrorMessageAuthenticator {
       ivyOriginalField.set(ivy, newOriginal)
     }
 
-    try Option(ivyOriginalField.get(ivy).asInstanceOf[Authenticator]) match {
-      case Some(
-            _: ErrorMessageAuthenticator
-          ) => // We're already installed, no need to do the work again.
-      case originalOpt => installIntoIvyImpl(originalOpt)
-    } catch {
+    try
+      Option(ivyOriginalField.get(ivy).asInstanceOf[Authenticator]) match {
+        case Some(
+              _: ErrorMessageAuthenticator
+            ) => // We're already installed, no need to do the work again.
+        case originalOpt => installIntoIvyImpl(originalOpt)
+      }
+    catch {
       case t: Throwable =>
         Message.debug(
           "Error occurred while trying to install debug messages into Ivy Authentication" + t.getMessage