Commit dc443064 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Adding support to detect conflicts

parent 91e4ce29