Permalink
Browse files

merge cruft

  • Loading branch information...
1 parent fd4f656 commit 7f8d596eba6e942d7dfe960c41b3724c0a4742bd @timf timf committed Jun 29, 2010
@@ -759,8 +759,4 @@ def _process_new_unproptargets(self, l_files, unproptargets_arg):
old = lf._unpropagation_target
lf._unpropagation_target = unproptargets[counter]
self.c.log.debug("old unpropagation target '%s' is now '%s'" % (old, lf._unpropagation_target))
-<<<<<<< HEAD
-
-=======
->>>>>>> 07ade63... First try at backend http support (needs better exception handling)

0 comments on commit 7f8d596

Please sign in to comment.