Skip to content

Commit

Permalink
fix #6151
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy committed Aug 3, 2012
1 parent 0235fad commit 3305ccd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python/plugins/fTools/tools/doMergeShapes.py
Expand Up @@ -127,7 +127,7 @@ def accept( self ):
outFile = QFile( self.outFileName )
if outFile.exists():
if not QgsVectorFileWriter.deleteShapeFile( self.outFileName ):
QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) )
QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( self.outFileName ) )
return

if self.inEncoding == None:
Expand Down

0 comments on commit 3305ccd

Please sign in to comment.