package smart_gs.network;

import javax.swing.JLabel;
import javax.swing.JScrollPane;

import jp.ac.nii.hcp.shared.model.ProjectDifference;
import smart_gs.swingui.ButtonDialog;

public class ConflictManagingWindow extends ButtonDialog {

	
	private ProjectDifference commitDiff;
	private JScrollPane diffPanel;

	public ConflictManagingWindow(ProjectDifference commitDiff) {
		super("Conflict Manager");
		this.commitDiff = commitDiff;
		JLabel label = new JLabel();
//		label.
//		this.diffPanel;

	}

	@Override
	public void ok() {
		// TODO Auto-generated method stub
		
	}

	@Override
	public void cancel() {
		// TODO Auto-generated method stub
		
	}
}
