Projects information

Chunk

Conflicting content
} <<<<<<< HEAD public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException { } ======= public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException { throw new RuntimeException("Not implemented"); } >>>>>>> f3e9729fbb7b1764c20317339f243dc070fca5fa }

Conflicting content

	}


<<<<<<< HEAD
    public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException {
    }
=======
	public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags)
			throws CoreException {
		throw new RuntimeException("Not implemented");
	}
>>>>>>> f3e9729fbb7b1764c20317339f243dc070fca5fa

}

Solution content
} public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException { throw new RuntimeException("Not implemented"); } }

File
AbstractIResourceStub.java

Developer's decision
Version 2

Kind of conflict
Method declaration

Projects >> Pydev >>21e0f75f585cea6c2e67f9cc05dacb3be985c315