From 8396a6a0cc223879bea53534f32bca09c4ec06ef Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Fri, 8 Jun 2018 15:46:31 +0200
Subject: [PATCH] Fix conflict between fixes on decompiler

From #4605 and #4608
---
 tests/run/simpleClass.decompiled | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/run/simpleClass.decompiled b/tests/run/simpleClass.decompiled
index d49784a495a4..d18f2b6ae9b8 100644
--- a/tests/run/simpleClass.decompiled
+++ b/tests/run/simpleClass.decompiled
@@ -4,7 +4,8 @@ object Test {
     scala.Predef.println(new foo.A().getClass().getName())
     scala.Predef.println(new foo.B().getClass().getName())
   }
-}/** Decompiled from out/runTestFromTasty/run/simpleClass/foo/A.class */
+}
+/** Decompiled from out/runTestFromTasty/run/simpleClass/foo/A.class */
 package foo {
   class A()
 }