matthiasblaesing commented on code in PR #8034:
URL: https://github.com/apache/netbeans/pull/8034#discussion_r1878629169


##########
webcommon/lib.chrome_devtools_protocol/nbproject/org-netbeans-lib-chrome_devtools_protocol.sig:
##########
@@ -1,5 +1,9 @@
 #Signature file v4.1
+<<<<<<< Updated upstream
 #Version 2.0
+=======
+#Version 1.2
+>>>>>>> Stashed changes

Review Comment:
   Thank you and yes the version in master is correct. I merged the JS 
ChromeDevTool fixes into master and overlooked, that this would clash here. 
Sorry about that!
   If I see this correctly, the file is not in the commit anymore, which looks 
right.



-- 
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.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
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

Reply via email to