summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2013-10-28 22:40:41 -0400
committerDevan Franchini <twitch153@gentoo.org>2013-10-28 22:40:41 -0400
commita4658f66d4c670e342062d795ac13a54d269920a (patch)
treecd7b2b522c746392e643e02143c69436d6493b57
parentWebappConfig/db.py converts keys dictionary to sorted list. (diff)
downloadwebapp-config-a4658f66d4c670e342062d795ac13a54d269920a.tar.gz
webapp-config-a4658f66d4c670e342062d795ac13a54d269920a.tar.bz2
webapp-config-a4658f66d4c670e342062d795ac13a54d269920a.zip
WebappConfig/db.py: Removes cherry-pick message in db.py.
-rw-r--r--WebappConfig/db.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index ba9dcca..11e5dae 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -672,9 +672,7 @@ class WebappSource(AppHierarchy):
if not packages:
OUT.die('No packages found!')
-<<<<<<< HEAD
keys = sorted(packages)
->>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list.
OUT.debug('Check for unused web applications', 7)