hg: openjfx/sandbox-9-jake/rt: 8091625: resolving merge conflicts in WinAppBundler.java file

[dmitry.cherepanov at oracle.com]

Changeset: cae7ce3eb606
Author:    dcherepanov
Date:      2015-12-16 03:53 -0500
URL:       http://hg.openjdk.java.net/openjfx/sandbox-9-jake/rt/rev/cae7ce3eb606

8091625: resolving merge conflicts in WinAppBundler.java file
Reviewed-by: cbensen, kcr

! modules/fxpackager/src/main/java/jdk/packager/builders/windows/WindowsAppImageBuilder.java
! modules/fxpackager/src/main/resources/com/oracle/tools/packager/windows/WinAppBundler.properties
! modules/fxpackager/src/main/resources/jdk/packager/builders/windows/WindowsAppImageBuilder.properties