summaryrefslogtreecommitdiff
path: root/python/skytools/scripting.py
diff options
context:
space:
mode:
authorMarko Kreen2012-11-29 10:50:02 +0000
committerMarko Kreen2012-11-29 10:50:02 +0000
commit94e279256828aa3deec54a28c86be7f64bc0d29f (patch)
treeb8c61be8190f5c6e34a824237d8c791fbd025a93 /python/skytools/scripting.py
parentb04da7ab0b108728faf906d4da920003d1e9d34d (diff)
tests/londiste: testcase for weird merge
Diffstat (limited to 'python/skytools/scripting.py')
0 files changed, 0 insertions, 0 deletions