git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77d3a60
)
fix bad merge
author
Niki Roo
<niki@nikiroo.be>
Thu, 2 Jan 2020 21:07:25 +0000
(22:07 +0100)
committer
Niki Roo
<niki@nikiroo.be>
Thu, 2 Jan 2020 21:07:25 +0000
(22:07 +0100)
TWidget.java
patch
|
blob
|
blame
|
history
diff --git
a/TWidget.java
b/TWidget.java
index ce22330576309206861b8246be3423a248499180..d60efd8d3a321236e2069199c6db2fb364505d69 100644
(file)
--- 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) {
* @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;
if (children.remove(child)) {
child.close();
child.parent = null;
@@
-1427,19
+1426,6
@@
public abstract class TWidget implements Comparable<TWidget> {
}
return false;
}
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
}
/**
}
/**