matthiasblaesing commented on a change in pull request #1624: [NETBEANS-3377] -
cleanup unchecked conversions
URL: https://github.com/apache/netbeans/pull/1624#discussion_r349780547
##########
File path:
ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/DebuggerManagerListener.java
##########
@@ -673,7 +673,11 @@ private static void doCloseDebuggerUI() {
final Set<Component> initiallyOpenedMinimized;
if (componentsInitiallyOpened.isEmpty()) {
initiallyOpened = Collections.emptyList();
+<<<<<<< HEAD
initiallyOpenedMinimized = Collections.EMPTY_SET;
+=======
+ initiallyOpenedMinimized = Collections.emptySet();
+>>>>>>> [NETBEANS-3377] - cleanup unchecked conversions
Review comment:
This is a merge conflict, that was not resolved - please check again.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
