Projects >> UniversalMediaServer >>c488f90b0b60299c353db6a40f36e3ec68ca0bda

Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
<<<<<<< HEAD

import javax.swing.JLabel;

import net.pms.Messages;
import net.pms.PMS;
import net.pms.newgui.LooksFrame;

=======
import net.pms.PMS;
>>>>>>> bc45deec20bcf0bbaa3425c0aab1ff41db9ca51b
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Solution content 
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import javax.swing.JLabel;

import net.pms.Messages;
import net.pms.PMS;
import net.pms.newgui.LooksFrame;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
File
ExternalFactory.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.awt.ComponentOrientation;
 */
package net.pms.newgui;

<<<<<<< HEAD
import java.awt.BorderLayout;
=======
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.factories.Borders;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import com.sun.jna.Platform;
>>>>>>> bc45deec20bcf0bbaa3425c0aab1ff41db9ca51b
import java.awt.Component;
import java.awt.Font;
Solution content 
 */
package net.pms.newgui;

import java.awt.BorderLayout;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.factories.Borders;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import com.sun.jna.Platform;
import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Font;
File
GeneralTab.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import java.awt.ComponentOrientation;
import java.awt.Font;
import java.awt.GridLayout;
<<<<<<< HEAD
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.Popup;
import javax.swing.PopupFactory;
import javax.swing.SwingUtilities;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;

=======
import java.awt.event.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.swing.*;
>>>>>>> bc45deec20bcf0bbaa3425c0aab1ff41db9ca51b
import net.pms.Messages;
import net.pms.PMS;
import net.pms.configuration.Build;
Solution content 
import java.awt.ComponentOrientation;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.*;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.Popup;
import javax.swing.PopupFactory;
import javax.swing.SwingUtilities;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;

import net.pms.Messages;
import net.pms.PMS;
import net.pms.configuration.Build;
File
GeneralTab.java
Developer's decision
Combination
Kind of conflict
Import