Merge commit '546da9bac7135d7d1b02dce0c0eef2209d939fc6' into sipb

[ikiwiki.git] / doc / todo / mirrorlist_with_per-mirror_usedirs_settings.mdwn

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index ca9cb532c2f8c44b868c9378ff756c8010a9e48a..5701d8e2b7b677b56cb13a23ee7160e83753f05f 100644 (file)
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -99,3 +99,5 @@ and decided this time it was really needed to implement this feature.
 >>>>>> this should not block the merge of the branch I have been
 >>>>>> proposing. Support for the usecase you are suggesting can
 >>>>>> always be added later if needed. --[[intrigeri]]
+
+>>>>>>> Well, that came out nice and clean. [[done]] --[[Joey]]