From 4519d017e4cfe3e655f56aba23aff33bd4fa71d0 Mon Sep 17 00:00:00 2001
From: Nikolaj Olsson <nikse.dk@gmail.com>
Date: Thu, 5 Sep 2024 21:25:46 +0200
Subject: [PATCH] Undo commit
 https://github.com/SubtitleEdit/subtitleedit/commit/db527e49857ec4aa8a06cbee7863730cf683004d

---
 src/ui/Forms/Main.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs
index b3835594b..e65d0697a 100644
--- a/src/ui/Forms/Main.cs
+++ b/src/ui/Forms/Main.cs
@@ -13225,17 +13225,8 @@ namespace Nikse.SubtitleEdit.Forms
                     }
                     else
                     {
-                        var text = (currentParagraph.Text.Trim() + Environment.NewLine +
-                                    RemoveAssStartAlignmentTag(nextParagraph.Text).Trim()).Trim();
-                        var oneLine = Utilities.UnbreakLine(text);
-                        if (oneLine.Length <= Configuration.Settings.General.SubtitleLineMaximumLength)
-                        {
-                            currentParagraph.Text = oneLine;
-                        }
-                        else
-                        {
-                            currentParagraph.Text = text;
-                        }
+                        currentParagraph.Text = (currentParagraph.Text.Trim() + Environment.NewLine +
+                                                 RemoveAssStartAlignmentTag(nextParagraph.Text).Trim()).Trim();
                     }
 
                     currentParagraph.Text = FixAssaTagsAfterMerge(currentParagraph.Text);