diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.source | 2 |
1 files changed, 2 insertions, 0 deletions
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 | |||
| 131 | may have got the file-ids wrong. Once you've committed the merge, you can | 131 | may have got the file-ids wrong. Once you've committed the merge, you can |
| 132 | throw away the tarball branch, as all its history will have been | 132 | throw away the tarball branch, as all its history will have been |
| 133 | incorporated. | 133 | incorporated. |
| 134 | |||
| 135 | (TODO: The above does not describe how to handle the gssapi branch.) | ||