bad svn for not barking at me for checking in conflicts

svn path=/main/branches/prefix/; revision=13683

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e7a53c577b985fc6999f1698eeea1e24f89144a1..d30174470debaf86c0f07cb692c3245da66d2801 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -10175,11 +10175,7 @@ class Scheduler(PollScheduler):
        _bad_resume_opts = set(["--ask", "--changelog",
                "--resume", "--skipfirst"])
 
-<<<<<<< .working
-       _fetch_log = EPREFIX + "/var/log/emerge-fetch.log"
-=======
        _fetch_log = os.path.join(_emerge_log_dir, 'emerge-fetch.log')
->>>>>>> .merge-right.r13652
 
        class _iface_class(SlotObject):
                __slots__ = ("dblinkEbuildPhase", "dblinkDisplayMerge",