summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorTapio Lehtonen <tale@debian.org>2006-08-03 08:52:34 +0000
committerTapio Lehtonen <tale@debian.org>2006-08-03 08:52:34 +0000
commit36b7671031dd059e7fa2b95da4ef7ddb1c279f81 (patch)
tree9f525dae3988abde6037fb716db68f530cebbeab /en
parent81c4b48fb03e653d67bc96f7c48c41a021faa645 (diff)
downloadinstallation-guide-36b7671031dd059e7fa2b95da4ef7ddb1c279f81.zip
Resolved conflict, dont't know where conflict came from
Diffstat (limited to 'en')
0 files changed, 0 insertions, 0 deletions