cybergarage-upnp
cybergarage-upnp copied to clipboard
Fix pom merge conflicts
Fixed those pom merge conflicts in https://github.com/cybergarage/CyberLink4Java/issues/1