Projects >> GangWars >>078618ae1191e23f2201e1e1af63c489cdfaa354

Chunk
Conflicting content 
			}
		});
		popUpRecruit.getContentPane().add(attackMode);
<<<<<<< HEAD
	
=======
>>>>>>> d1db60d6a568d8fda1624b63cfc1c641ed8e70ea
		popUpRecruit.setClosable(true);
		this.getContentPane().add(popUpRecruit, 0);
		popUpBuild = new JInternalFrame();
Solution content 
			}
		});
		popUpRecruit.getContentPane().add(attackMode);

		popUpRecruit.setClosable(true);
		this.getContentPane().add(popUpRecruit, 0);
		popUpBuild = new JInternalFrame();
File
ViewGUI.java
Developer's decision
Version 1
Kind of conflict
Blank