# HG changeset patch # User herrick # Date 1569970393 14400 # Node ID 788704ff2559b5d7cc4eb470b1e5e7623cfe69e5 # Parent b00cbf427368e8032ef013234c3b84bffaaaed05 fix bad merge diff -r b00cbf427368 -r 788704ff2559 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java Tue Oct 01 18:22:34 2019 -0400 +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java Tue Oct 01 18:53:13 2019 -0400 @@ -26,6 +26,7 @@ import java.awt.image.BufferedImage; import java.io.*; +import java.nio.file.InvalidPathException; import java.nio.file.Files; import java.nio.file.Path; import java.text.MessageFormat;