Code review comment for lp://staging/~mario-kemper/shutter/Bug342628

Revision history for this message
Mario Kemper (Romario) (mario-kemper) wrote :

mario@mario:~/shutter/shutter$ bzr merge ../Bug342628
 M bin/shutter
 M share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
Text conflict in share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
1 conflicts encountered.

review: Needs Fixing

« Back to merge proposal