search

openbaton / generic-vnfm

Repository containing the source code of the generic VNFM
Apache License 2.0
20 stars 20 forks source link

Unresolved merge conflict markers #7

Closed jurejesensek closed 8 years ago

jurejesensek commented 8 years ago

The gradle-wrapper.properties file contains unresolved merge conflict markers.

lorenzotomasini commented 8 years ago

Thank you,

Since it is inside the subtree we fixed it in the openbaton-libs repository. We will soon merge it in the next commits of the generic and nfvo