Projects >> unofficial-dropbox >>0c8991e968051af669f4bc69caeb4d456fb4364e

Chunk
Conflicting content
import javax.swing.JFrame;
import java.io.*;
import java.awt.*;
<<<<<<< HEAD
import java.lang.Thread;
=======
import java.net.URL;
import javax.swing.ImageIcon;

>>>>>>> 034cb07c1688f87551c5c964360db0e3809141f4
/**
 * The application's main frame.
 */
Solution content
import javax.swing.JFrame;
import java.io.*;
import java.awt.*;
import java.lang.Thread;
/**
 * The application's main frame.
 */
File
IvleFileSyncView.java
Developer's decision
Version 1
Kind of conflict
Import