From 6ad6994c288662fca6949f42bf91fec2aff00bca Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 1 Jan 2010 17:15:54 +0000 Subject: TODO for gssapi branch handling --- debian/README.source | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/README.source b/debian/README.source index 01bf8b43a..79e8558ee 100644 --- a/debian/README.source +++ b/debian/README.source @@ -131,3 +131,5 @@ conflicts, and commit. If you see lots of "Contents conflict" messages, you may have got the file-ids wrong. Once you've committed the merge, you can throw away the tarball branch, as all its history will have been incorporated. + +(TODO: The above does not describe how to handle the gssapi branch.) -- cgit v1.2.3