Resolve conflict.

Long ago, VCSs would warn when you would want to commit conflict
markers.

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 5651e7d74eb48a83071d38110ca0a7a204444360..b2aac068e800779212ab277c13a5ba66eed88369 100644 (file)
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -90,10 +90,6 @@ def _get_global(k):
                        secpass = 2
                #Discover the uid and gid of the portage user/group
                try:
-<<<<<<< HEAD
-=======
-                       portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
->>>>>>> overlays-gentoo-org/master
                        portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
                except KeyError:
                        # PREFIX LOCAL: some sysadmins are insane, bug #344307
@@ -103,7 +99,7 @@ def _get_global(k):
                                portage_gid = None
                        # END PREFIX LOCAL
                try:
-                       portage_uid = pwd.getpwnam(_get_global('_portage_uname')).pw_uid
+                       portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
                        if secpass < 1 and portage_gid in os.getgroups():
                                secpass = 1
                except KeyError: