Projects >> jebberwocky-contactsback-android >>1ce805018dbda756d5f0fbe8d743691efad613ce

Chunk
Conflicting content 
        exporters.add(new GsonExporter());
        exporters.add(new TextExporter());
        exporters.add(new XmlExporter());
<<<<<<< HEAD
        //Exporter exporter = new CsvExporter();
        //exporter.ExportToFile(contacts)
        for(Exporter exporter: exporters){
            exporter.ExportToFile(contacts);
=======
        for (Exporter exporter : exporters) {
            exporter.export(contacts);
>>>>>>> abc121f9bcd1d892abc9766e2dc2e4161cdc5b07
        }
    }
}
Solution content 
        exporters.add(new GsonExporter());
        exporters.add(new TextExporter());
        exporters.add(new XmlExporter());
        for (Exporter exporter : exporters) {
            exporter.export(contacts);
        }
    }
}
File
MainActivity.java
Developer's decision
Version 2
Kind of conflict
Comment
For statement
Method invocation