Skip to content

Fixing conflict code and deleting pkm certificate

Eduardo Martín Izquierdo requested to merge fix-conflict into master

Deleting lines of merge conflict. Also, the PKM certificate is deleted for security reasons.

Merge request reports