From 8a1cae77d279cc246a68109f6178b2bb05e7471f Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Thu, 2 Jan 2020 22:07:25 +0100 Subject: [PATCH] fix bad merge --- TWidget.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/TWidget.java b/TWidget.java index ce223305..d60efd8d 100644 --- a/TWidget.java +++ b/TWidget.java @@ -1415,7 +1415,6 @@ public abstract class TWidget implements Comparable { * @return TRUE if the child was removed, FALSE if it was not found */ public boolean removeChild(final TWidget child) { -<<<<<<< HEAD:TWidget.java if (children.remove(child)) { child.close(); child.parent = null; @@ -1427,19 +1426,6 @@ public abstract class TWidget implements Comparable { } return false; -======= - if (children.remove(child)) { - child.close(); - child.parent = null; - child.window = null; - - resetTabOrder(); - - return true; - } - - return false; ->>>>>>> upstream-sep2019-tcombo:src/jexer/TWidget.java } /** -- 2.27.0