From 97ad87a656c26e93f3d4d51776dfb9e7533c7d25 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 10 Dec 2011 13:06:09 +0100
Subject: [PATCH] remove conflict marker

---
 pym/portage/dispatch_conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 11a6a7d83..88ed222dd 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -42,7 +42,6 @@ def diffstatusoutput_len(cmd):
 def read_config(mandatory_opts):
     eprefix = EPREFIX
     config_path = os.path.join(eprefix or os.sep, "etc/dispatch-conf.conf")
->>>>>>> overlays-gentoo-org/master
     loader = KeyValuePairFileLoader(config_path, None)
     opts, errors = loader.load()
     if not opts:
-- 
2.26.2