[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/_dyn_libs/

[Fabian Groffen]

commit:     a719fc4b3e858ab8ddf6e64be5bf632624bdbe7d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 18:30:16 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 18:30:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a719fc4b

LinkageMapELF: remove conflict marker

 pym/portage/util/_dyn_libs/LinkageMapELF.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py 
b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index d5d3a55..b32ee81 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -43,7 +43,6 @@ _approx_multilib_categories = {
        "SPARCV9":       "sparc_64",
        "X86_64":        "x86_64",
 }
->>>>>>> overlays-gentoo-org/master
 
 class LinkageMapELF(object):