diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:26:56 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:26:56 -0400 |
| commit | 5c041343fab9b643998e4390e109f69171841d94 (patch) | |
| tree | cace6552927cfc94668e46f2a7ccf651d8baf1b8 | |
| parent | bede52c54ea4b7bd36ba5d5ce148648a7c296976 (diff) | |
| download | external_python_setuptools-5c041343fab9b643998e4390e109f69171841d94.tar.gz external_python_setuptools-5c041343fab9b643998e4390e109f69171841d94.tar.bz2 external_python_setuptools-5c041343fab9b643998e4390e109f69171841d94.zip | |
Add heading
| -rw-r--r-- | docs/merge-faq.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt index c2f90e7f..65fce3c0 100644 --- a/docs/merge-faq.txt +++ b/docs/merge-faq.txt @@ -1,3 +1,6 @@ +Setuptools/Distribute Merge FAQ +------------------------------- + Where does the merge occur? ======================================================== |