summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaran.mccreesh@googlemail.com>2008-04-24 19:44:08 +0100
committerCiaran McCreesh <ciaran.mccreesh@googlemail.com>2008-04-24 19:44:08 +0100
commitc29a277be3eec6b4dd3afee0d71697dd6e07f209 (patch)
treee65bbf86229066c37c09d9a8c35c9a5f27506979 /pms.tex
parentMerge branch 'historical-curiosities' (diff)
downloadpms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.tar.gz
pms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.tar.bz2
pms-c29a277be3eec6b4dd3afee0d71697dd6e07f209.zip
Document the merge process, take 2
Diffstat (limited to 'pms.tex')
-rw-r--r--pms.tex2
1 files changed, 1 insertions, 1 deletions
diff --git a/pms.tex b/pms.tex
index c14c122..9a245ee 100644
--- a/pms.tex
+++ b/pms.tex
@@ -126,7 +126,7 @@
\include{ebuild-environment}
-\include{config-protection}
+\include{merge}
\include{glossary}