From 828d145bf60cb94ea826a8dffa8b55d5a472f5d8 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Sun, 7 Apr 2019 17:11:54 +0200
Subject: [PATCH] Fix merge conflict

---
 .../src-bootstrapped/scala/internal/quoted/Matcher.scala  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/src-bootstrapped/scala/internal/quoted/Matcher.scala b/library/src-bootstrapped/scala/internal/quoted/Matcher.scala
index 3d8ea7bbc467..11c86ee33fc7 100644
--- a/library/src-bootstrapped/scala/internal/quoted/Matcher.scala
+++ b/library/src-bootstrapped/scala/internal/quoted/Matcher.scala
@@ -180,12 +180,12 @@ object Matcher {
                  |Scrutinee
                  |  ${scrutinee.showCode}
                  |
-                 |${scrutinee.show}
+                 |${scrutinee.showExtractors}
                  |
                  |did not match pattern
                  |  ${pattern.showCode}
                  |
-                 |${pattern.show}
+                 |${pattern.showExtractors}
                  |
                  |
                  |
@@ -253,12 +253,12 @@ object Matcher {
                |Scrutinee
                |  ${scrutinee.showCode}
                |
-               |${scrutinee.show}
+               |${scrutinee.showExtractors}
                |
                |did not match pattern
                |  ${pattern.showCode}
                |
-               |${pattern.show}
+               |${pattern.showExtractors}
                |
                |
                |