From a1aa6d8eea3a7e862a1e6f14df20068ff133740b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 2 Nov 2017 17:47:40 -0700
Subject: [PATCH] Resolving merge conflict.

---
 .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
index 588c2c85..ef13665c 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
@@ -234,7 +234,8 @@ class KotlinCompiler @Inject constructor(
                         s
                     }
 
-                override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
+                override fun report(severity: CompilerMessageSeverity, message: String,
+                                    location: CompilerMessageLocation?) {
                     if (severity.isError) {
                         "Couldn't compile file: ${dump(location, message)}".let { fullMessage ->
                             throw KobaltException(fullMessage)