| Chunk |
|---|
| Conflicting content |
|---|
* It is the responsibility of the caller to close the stream.
*
* @param xmlStream a stream of xml
<<<<<<< HEAD
=======
* @throws IOException if there was a problem parsing the xmlStream
* @throws SAXException if we couldn't get SAXParser to work
>>>>>>> b1f675191bb81118c11594466a35315d173c21ae
*/
public void parseUnimodXML(InputStream xmlStream) {
|
| Solution content |
|---|
* It is the responsibility of the caller to close the stream.
*
* @param xmlStream a stream of xml
*/
public void parseUnimodXML(InputStream xmlStream) {
|
| File |
|---|
| Unimod.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |