Conflict adding file share/symbols/MapSymbolsNPS.svg. Moved existing file to share/symbols/MapSymbolsNPS.svg.moved.
Text conflict in src/extension/internal/metafile-inout.cpp
Text conflict in src/libnrtype/FontFactory.cpp
Text conflict in src/libnrtype/font-lister.cpp
Text conflict in src/live_effects/lpe-powerstroke-interpolators.h
Text conflict in src/live_effects/lpe-powerstroke.cpp
6 conflicts encountered.
Por favor faça seu login para deixar um comentário!