Projects >> ImageJA >>1c5832d7966477a5a2eb50d197cc135789e36cb4

Chunk
Conflicting content
				}
			}
		}
<<<<<<< HEAD
		if (!changes && Menus.window.getItemCount()>Menus.WINDOW_MENU_ITEMS) {
			GenericDialog gd = new GenericDialog("ImageJA", this);
			gd.addMessage("Are you sure you want to quit ImageJA?");
=======
		if (!changes && Menus.window.getItemCount()>Menus.WINDOW_MENU_ITEMS && !(IJ.macroRunning()&&WindowManager.getImageCount()==0)) {
			GenericDialog gd = new GenericDialog("ImageJ", this);
			gd.addMessage("Are you sure you want to quit ImageJ?");
>>>>>>> 1185bb4557c63187e8eb44c07a67ba63bc3fdc53
			gd.showDialog();
			quitting = !gd.wasCanceled();
		}
Solution content
				}
			}
		}
		if (!changes && Menus.window.getItemCount()>Menus.WINDOW_MENU_ITEMS && !(IJ.macroRunning()&&WindowManager.getImageCount()==0)) {
			GenericDialog gd = new GenericDialog("ImageJA", this);
			gd.addMessage("Are you sure you want to quit ImageJA?");
			gd.showDialog();
			quitting = !gd.wasCanceled();
		}
File
ImageJ.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable