This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

merge conflict
diff.png (image/png), 44.34 KB, created by toben on 2013-01-24 09:34:44 UTC
(hide)
 
Creator: toben
Created: 2013-01-24 09:34:44 UTC
Size: 44.34 KB

The attachment is not viewable in your browser due to security restrictions enabled by your Apache NetBeans Bugzilla administrator.

In order to view the attachment, you first have to download it.

Actions: View
Attachments on bug 212159: 130566