From f5f02ea911502cfbbb99dfc688b1e9aa891f405b Mon Sep 17 00:00:00 2001
From: Aleksandr Mishin <mishin.aa@phystech.edu>
Date: Fri, 23 Sep 2022 13:41:48 +0300
Subject: [PATCH] #162: conflicts resolved

---
 src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt | 4 ----
 src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt b/src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt
index eb57138e..ba9b1d1e 100644
--- a/src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt
+++ b/src/main/kotlin/org/polystat/j2eo/treeMapper/TreeMappings.kt
@@ -194,11 +194,7 @@ fun BlockContext.toBlock(): Block {
     val blockStmnts = BlockStatements(blockStmntsLst.removeFirstOrNull())
     blockStmntsLst.forEach { blockStmnts.add(it) }
     blockStmnts.blockStatements.removeIf { it == null }
-<<<<<<< HEAD
-    return Block(null /*not always null? */, blockStmnts)
-=======
     return Block(null, blockStmnts)
->>>>>>> master
 }
 
 fun Declaration.toBlockStatement(): BlockStatement = BlockStatement(this)
diff --git a/src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt b/src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt
index cf26464e..18cd90e9 100644
--- a/src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt
+++ b/src/main/kotlin/org/polystat/j2eo/util/StaticGenerator.kt
@@ -20,7 +20,7 @@ fun generateStatic(clsDec: NormalClassDeclaration, context: Context): List<EOBnd
             dec.modifiers?.modifiers?.modifiers?.find { it == TokenCode.Static } != null ||
                 dec is ConstructorDeclaration ||
                 dec is ClassDeclaration /* FIXME (IT'S NOT ALWAYS TRUE) */
-                dec is ClassDeclaration
+            dec is ClassDeclaration
         }
         .map { mapClassDeclaration(it, context) }
         .flatten()