[Pkg-privacy-commits] [nautilus-wipe] 80/224: Fix conflict resolution

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository nautilus-wipe.

commit 806f1b204385f9488771251eaf0b6218b1945a4b
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Tue Mar 30 17:36:35 2010 +0200

    Fix conflict resolution
---
 help/C/nautilus-srm.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/help/C/nautilus-srm.txt b/help/C/nautilus-srm.txt
index 986ecf2..c564211 100644
--- a/help/C/nautilus-srm.txt
+++ b/help/C/nautilus-srm.txt
@@ -88,6 +88,7 @@ nautilus-secure-delete enables you to wipe files and free disk space
 from `nautilus` using the `secure-delete` program written by van Hauser
 / THC [3]
 
+
 >     The deletion process is as follows:
 >
 >     1. The overwriting procedure (in the secure mode) does a 38 times

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git