Projects >> TDA367 >>9ebe5be20dfa2688b52a6a724c27f5fd5ce2d131

Chunk
Conflicting content 
package cha;

<<<<<<< HEAD

=======
>>>>>>> 09491c08ba62a0553a3ee2c0e020c91417bd3d96
import cha.gui.MainFrame;

public class Main {
Solution content 
package cha;


import cha.gui.MainFrame;

public class Main {
File
Main.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
			startGame();
		}
		else if(e.getSource() == endGame){
<<<<<<< HEAD
			int reply = JOptionPane.showConfirmDialog(null, "�r du s�ker p� att du vill avsluta?", null, JOptionPane.YES_NO_OPTION);
=======
			int reply = JOptionPane.showConfirmDialog(null, "�r du s�ker p� att du vill avsluta?", null, JOptionPane.YES_NO_OPTION);
>>>>>>> 09491c08ba62a0553a3ee2c0e020c91417bd3d96
			if (reply == JOptionPane.YES_OPTION){
		      System.exit(0);
		    }
Solution content 
			startGame();
		}
		else if(e.getSource() == endGame){
			int reply = JOptionPane.showConfirmDialog(null, "�r du s�ker p� att du vill avsluta?", null, JOptionPane.YES_NO_OPTION);

			if (reply == JOptionPane.YES_OPTION){
		      System.exit(0);
		    }
File
MainFrame.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
					break;
				}
			} catch (NumberFormatException e) { }
<<<<<<< HEAD
			String message = "Fel antal spelare";
			JOptionPane.showMessageDialog(this, message, "Error", 
=======
			JOptionPane.showMessageDialog(this, "Must be a number between 2-8", "Error", 
>>>>>>> 09491c08ba62a0553a3ee2c0e020c91417bd3d96
					JOptionPane.ERROR_MESSAGE, null);
		}
Solution content 
					break;
				}
			} catch (NumberFormatException e) { }

			JOptionPane.showMessageDialog(this, "M�ste vara en siffra mellan 2-8", "Error", 

					JOptionPane.ERROR_MESSAGE, null);
		}
File
MainFrame.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable