X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=TWidget.java;h=d60efd8d3a321236e2069199c6db2fb364505d69;hb=8a1cae77d279cc246a68109f6178b2bb05e7471f;hp=ce22330576309206861b8246be3423a248499180;hpb=77d3a60869e7a780c6ae069e51530e1eacece5e2;p=fanfix.git

diff --git a/TWidget.java b/TWidget.java
index ce22330..d60efd8 100644
--- a/TWidget.java
+++ b/TWidget.java
@@ -1415,7 +1415,6 @@ public abstract class TWidget implements Comparable<TWidget> {
      * @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<TWidget> {
         }
         
         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
     }
 
     /**