summaryrefslogtreecommitdiff
path: root/morphlib/sourcemanager.py
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-02-14 12:18:03 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-02-14 12:18:03 +0000
commit2bf41f2809f2a97b2c84bf75df725fcba75b5624 (patch)
treed9120ba447f2ad58084f1d78fa4626128a4a14f2 /morphlib/sourcemanager.py
parenta442867a19b28195ce850f16b3efd41143d6ac12 (diff)
downloadmorph-2bf41f2809f2a97b2c84bf75df725fcba75b5624.tar.gz
Fix something that was inserted by accident.
Diffstat (limited to 'morphlib/sourcemanager.py')
-rw-r--r--morphlib/sourcemanager.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/morphlib/sourcemanager.py b/morphlib/sourcemanager.py
index a76fa880..ced3e53e 100644
--- a/morphlib/sourcemanager.py
+++ b/morphlib/sourcemanager.py
@@ -152,7 +152,6 @@ class SourceManager(object):
def _cache_repo_from_base_urls(self, repo, ref):
self.msg('Checking repository %s' % repo)
self.indent_more()
->>>>>>> a4ff907... Rewrite get_treeish(), fetching and update code.
def fixup_url(url):
return (url if url.endswith('/') else url + '/')