From c86b48bb9e37996475044536db9abc7d0bb4ec94 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Wed, 18 Dec 2024 12:47:50 +0100 Subject: [PATCH] Update MessageComposerInput.kt --- .../android/ui/home/messagecomposer/MessageComposerInput.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt index e1c1dc4898..63493efa43 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt @@ -29,11 +29,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.text.KeyboardOptions -<<<<<<< HEAD -======= import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.TextFieldState ->>>>>>> bd79bceaa (fix: new line can not be added to message composer (#3754)) import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton