Skip to content

Commit

Permalink
fix merge problem between chewiebug#129 and chewiebug#130
Browse files Browse the repository at this point in the history
  • Loading branch information
chewiebug authored and Allen Reese committed Oct 5, 2015
1 parent 2eaefdf commit 3f2d24d
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.imageio.ImageIO;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
Expand Down

0 comments on commit 3f2d24d

Please sign in to comment.