summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2012-06-11 13:48:35 -0700
committerSteve Langasek <steve.langasek@canonical.com>2012-06-11 13:48:35 -0700
commit3e2f47aa06ec46c582d4af7404bede4e48848829 (patch)
tree56e1a66d5c32cba91a59cd0c31d0e56aa7bc503d /data/templates
parent07aa1e7881b5e66fce1d4504b356f2b2330495d8 (diff)
parentadb0326614b3c06968eb0c30c91f1290773cd4cc (diff)
downloadpython-apt-3e2f47aa06ec46c582d4af7404bede4e48848829.tar.gz
Fix conflicts with Ubuntu branch
Diffstat (limited to 'data/templates')
0 files changed, 0 insertions, 0 deletions