| 1 |
commit: 844f073fdd6626082b5138ae6e1d7b9d0634fe18 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 30 16:49:02 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 30 16:49:02 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=844f073f |
| 7 |
|
| 8 |
Removed missed line from merge conflict |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/Package.py | 1 - |
| 12 |
1 files changed, 0 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py |
| 15 |
index aac309a..e6fd33d 100644 |
| 16 |
--- a/pym/_emerge/Package.py |
| 17 |
+++ b/pym/_emerge/Package.py |
| 18 |
@@ -89,7 +89,6 @@ class Package(Task): |
| 19 |
usealiases = self.root_config.settings._use_manager.getUseAliases(self) |
| 20 |
self.iuse = self._iuse(self, iuse.split(), implicit_match, |
| 21 |
usealiases, self.eapi) |
| 22 |
->>>>>>> v2.2.0_alpha143 |
| 23 |
|
| 24 |
if (self.iuse.enabled or self.iuse.disabled) and \ |
| 25 |
not eapi_attrs.iuse_defaults: |
Archives