Projects >> emul >>c5a12c5c44d2bb9bba7630fe8e320540fda57c90

Chunk
Conflicting content
				String boundsPref = SwtPrefUtils.writeBoundsString(shell.getBounds());
				settingsHandler.get(settingEmulatorWindowBounds).setString(boundsPref);
				machine.getClient().close();
<<<<<<< HEAD
				dispose();
=======
				
				dispose();
				
				// FIXME:  AWT doesn't want to quit all the time... force it after a reasonable time 
				Thread reallyQuit = new Thread() {
					public void run() {
						try {
							Thread.sleep(1000);
							System.exit(0);
						} catch (InterruptedException e) {
						}
					}
				};
				reallyQuit.setDaemon(true);
				reallyQuit.start();
>>>>>>> 0d1b0b796c9a8f51543494bf502795998146aa17
			}
		});
		
Solution content
				String boundsPref = SwtPrefUtils.writeBoundsString(shell.getBounds());
				settingsHandler.get(settingEmulatorWindowBounds).setString(boundsPref);
				machine.getClient().close();
				
				dispose();
				
				// FIXME:  AWT doesn't want to quit all the time... force it after a reasonable time 
				Thread reallyQuit = new Thread() {
					public void run() {
						try {
							Thread.sleep(1000);
							System.exit(0);
						} catch (InterruptedException e) {
						}
					}
				};
				reallyQuit.setDaemon(true);
				reallyQuit.start();
			}
		});
		
File
SwtWindow.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable