my changelog was in conflict, resolving this

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@456 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index 12385a062354886a5419786157930cd5bfb9e503..203209af8160041b98310eadc95eae07913af47b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ version 0.9.5 -- unreleased
        sys:
         . Fixed typo breaking things for VServers.
         . Fix bug when vrootdir is on its own partition (Closes: #395928)
+       rub
+        . Fixed typo in rub handler that caused it to not work
         . Better sfdisk error and output handling: should now properly warn
           when it does not manage to backup a partition table, and shut up when
           it succeeds (Closes: #396632)