| 1 |
Author: grobian |
| 2 |
Date: 2009-08-24 10:05:03 +0000 (Mon, 24 Aug 2009) |
| 3 |
New Revision: 14149 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/Binpkg.py |
| 7 |
Log: |
| 8 |
conflicts are bad, and not valid python syntax |
| 9 |
|
| 10 |
Modified: main/branches/prefix/pym/_emerge/Binpkg.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/pym/_emerge/Binpkg.py 2009-08-24 09:50:34 UTC (rev 14148) |
| 13 |
+++ main/branches/prefix/pym/_emerge/Binpkg.py 2009-08-24 10:05:03 UTC (rev 14149) |
| 14 |
@@ -22,11 +22,8 @@ |
| 15 |
sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) |
| 16 |
import portage |
| 17 |
from portage.output import colorize |
| 18 |
-<<<<<<< .working |
| 19 |
from portage.const import EPREFIX |
| 20 |
-======= |
| 21 |
|
| 22 |
->>>>>>> .merge-right.r13998 |
| 23 |
class Binpkg(CompositeTask): |
| 24 |
|
| 25 |
__slots__ = ("find_blockers", |
Archives