Projects >> robolectric >>a6d34e0b33533736dd8425a582ed48b40f18ac06

Chunk
Conflicting content
        for (int i = 0; i < items.getLength(); i++) {
            Node item = items.item(i);
<<<<<<< HEAD
            String drawableName = item.getAttributes().getNamedItem("android:drawable").getNodeValue();
            if (resourceName.startsWith("android:")) {
                drawableIds[i] = -1;
            } else {
                drawableIds[i] = resourceExtractor.getResourceId(drawableName);
=======
            Node drawableName = item.getAttributes().getNamedItem(
                    "android:drawable");
            if( drawableName != null ) {
            	drawableIds[i] = resourceExtractor.getResourceId(drawableName
                    .getNodeValue());
>>>>>>> 015b696fc090c9be4ce0f219f4c8a7b2c0a10702
            }
        }
Solution content
        for (int i = 0; i < items.getLength(); i++) {
            if (resourceName.startsWith("android:")) {
                drawableIds[i] = -1;
            } else {
                Node item = items.item(i);
                Node drawableName = item.getAttributes().getNamedItem("android:drawable");
                if (drawableName != null) {
                    drawableIds[i] = resourceExtractor.getResourceId(drawableName.getNodeValue());
                }
            }
        }
File
DrawableResourceLoader.java
Developer's decision
Manual
Kind of conflict
Array access
If statement
Method invocation
Variable