From: Niki Roo <niki@nikiroo.be>
Date: Fri, 3 Apr 2020 09:31:56 +0000 (+0200)
Subject: Merge commit '8a1cae77d279cc246a68109f6178b2bb05e7471f'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=d442b96e0b1453c21abf7f34bfaf73dcbed2a7ee;hp=-c

Merge commit '8a1cae77d279cc246a68109f6178b2bb05e7471f'
---

d442b96e0b1453c21abf7f34bfaf73dcbed2a7ee
diff --combined src/jexer/TWidget.java
index ce22330,d60efd8..d60efd8
--- a/src/jexer/TWidget.java
+++ b/src/jexer/TWidget.java
@@@ -1415,7 -1415,6 +1415,6 @@@ public abstract class TWidget implement
       * @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 +1426,6 @@@
          }
          
          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
      }
  
      /**