Rebase and resolve conflicts

Flank · May 6, 2021 · cda1260 · cda1260
1 parent 8d40a8a
commit cda1260
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt b/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt
@@ -5,6 +5,7 @@ import ftl.environment.android.toCliTable
 import ftl.environment.common.toCliTable
 import ftl.environment.ios.toCliTable
 import ftl.environment.toCliTable
+import ftl.presentation.cli.firebase.test.locale.toCliTable
 
 fun TestEnvironment.Android.prepareOutputString() = buildString {
     appendLine(osVersions.toCliTable())