| 1 |
commit: a4658f66d4c670e342062d795ac13a54d269920a |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 29 02:40:41 2013 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 02:40:41 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a4658f66 |
| 7 |
|
| 8 |
WebappConfig/db.py: Removes cherry-pick message in db.py. |
| 9 |
|
| 10 |
--- |
| 11 |
WebappConfig/db.py | 2 -- |
| 12 |
1 file changed, 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/WebappConfig/db.py b/WebappConfig/db.py |
| 15 |
index ba9dcca..11e5dae 100644 |
| 16 |
--- a/WebappConfig/db.py |
| 17 |
+++ b/WebappConfig/db.py |
| 18 |
@@ -672,9 +672,7 @@ class WebappSource(AppHierarchy): |
| 19 |
if not packages: |
| 20 |
OUT.die('No packages found!') |
| 21 |
|
| 22 |
-<<<<<<< HEAD |
| 23 |
keys = sorted(packages) |
| 24 |
->>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list. |
| 25 |
|
| 26 |
OUT.debug('Check for unused web applications', 7) |
Archives