1. Conflict adding file share/symbols/MapSymbolsNPS.svg. Moved existing file to share/symbols/MapSymbolsNPS.svg.moved.
  2. Text conflict in src/extension/internal/metafile-inout.cpp
  3. Text conflict in src/libnrtype/FontFactory.cpp
  4. Text conflict in src/libnrtype/font-lister.cpp
  5. Text conflict in src/live_effects/lpe-powerstroke-interpolators.h
  6. Text conflict in src/live_effects/lpe-powerstroke.cpp
  7. 6 conflicts encountered.
  1. More ...
 
 

39

 

1373

Pasted Text #0

-

PasteBin

Taille
424 octets
Créé le
Type
text/plain
Public Domain (PD)
Connectez-vous pour ajouter un commentaire !