Tons of merge conflicts in your files about cybergarage-upnp HOT 4 OPEN

I just found another merge conflict in the main pom.xml file:

https://github.com/cybergarage/CyberLink4Java/blob/master/pom.xml

After doing a:

grep -r "<<<<" * | wc -l

On the master branch there are currently 46 unresolved but committed merge conflicts. Is there a HEAD that we should revert to that is the last known good version?

from cybergarage-upnp.

I think this account is pretty much dead. If you still need it, you should fork and fix it 😭

from cybergarage-upnp.

Ok, done.

from cybergarage-upnp.

Feel free to follow my repository instead until this one is updated. If this code works I'll probably be using it a bit in the next week or two. https://github.com/timmattison/CyberLink4Java

from cybergarage-upnp.