Resolved merge conflicts in flash/pom.xml
Resolved merge conflicts in main pom.xml
Resolved merge conflicts in proxy/upnp-proxy/pom.xml
Resolved merge conflicts in proxy/upnp-proxy-gui/pom.xml
Resolved merge conflicts in proxy/upnp-sample-proxy/pom.xml
Resolved merge conflicts in rui/upnp-rui/pom.xml
Resolved merge conflicts in upnp-stack/pom.xml
Resolved merge conflicts in tools/pom.xml
Partial merge conflict resolution for tools/igd-tool/pom.xml
Added relative path back to tools/igd-tool/pom.xml
Resolved merge conflicts in tools/control-point/pom.xml
Resolved merge conflicts in std/pom.xml
Resolved merge conflicts in samples/washer/pom.xml
Resolved merge conflicts in samples/tv/pom.xml
Resolved merge conflicts in samples/remote-controller/pom.xml
Resolved merge conflicts in samples/pom.xml
Resolved merge conflicts in samples/light/pom.xml
Resolved merge conflicts in samples/clock/pom.xml
Resolved merge conflicts in samples/air-conditioner/pom.xml
Resolved merge conflicts in rui/upnp-rui-server/pom.xml