guinux 5ecbbbd9c3 fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00

..

__init__.py

fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00

config.py

fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00

transaction.py

fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00

tray.py

fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00

update.py

fix handling conflicts (I hope)

2012-12-29 15:06:44 +01:00