From 148afd3096e1ec325d10005994124a585a897151 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 24 Jun 2009 08:45:19 +0000
Subject: [PATCH] bad svn for not barking at me for checking in conflicts

svn path=/main/branches/prefix/; revision=13683
---
 pym/_emerge/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e7a53c577..d30174470 100644
--- 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",
-- 
2.26.2