branch ahead of origin
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into dev
pull de dev
Merge between remote and local branch
Merge remote branch dev into local branch dev
Merge branch 'dev' of github.com:DSI-ETSII-ULL/PosImposible into dev
fixed pattern issue
merge conflict resolved