Branch: refs/heads/hotfix/3.2.1
  Home:   https://github.com/cytoscape/cytoscape-impl
  Commit: 7bd9b1f2a90d3f838a167b7ffdac641b7ab41636
      
https://github.com/cytoscape/cytoscape-impl/commit/7bd9b1f2a90d3f838a167b7ffdac641b7ab41636
  Author: Keiichiro Ono <[email protected]>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M graphml-impl/pom.xml
    M 
graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLParser.java
    M 
graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReader.java
    R graphml-impl/src/main/resources/META-INF/MANIFEST.MF
    R 
graphml-impl/src/main/resources/org/cytoscape/data/reader/graphml/app.props
    M 
graphml-impl/src/test/java/org/cytoscape/data/reader/graphml/GraphMLReaderTest.java

  Log Message:
  -----------
  Conflicts have been resolved for graphml-impl pom file.


-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.

Reply via email to