remove conflict marker

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 11a6a7d839f1f11b245740a294a03e38e9f13aef..88ed222ddef5c364d4c823122b67f8c3822311c2 100644 (file)
--- 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: