Projects >> memory >>a2b25d6ff566e99ece5b0ddd8ccd176aedc4733d

Chunk
Conflicting content
	 */
	public Deck(ZipFile zip, Context ctx) throws IOException {
		Enumeration e = zip.entries();
<<<<<<< HEAD
		frontSide = new ArrayList();
=======
		
>>>>>>> 50f287d40d14b0e3809527a89682f21a13952c6e
		while(e.hasMoreElements()) {
			ZipEntry entry = e.nextElement();
			InputStream f = zip.getInputStream(entry);
Solution content
	 */
	public Deck(ZipFile zip, Context ctx) throws IOException {
		Enumeration e = zip.entries();
		frontSide = new ArrayList();

		while(e.hasMoreElements()) {
			ZipEntry entry = e.nextElement();
			InputStream f = zip.getInputStream(entry);
File
Deck.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation