diff options
| author |   Ian Delaney <della5@iinet.com.au> | 2012-04-16 01:02:32 +0800 |
|---|---|---|
| committer | Ian Delaney <della5@iinet.com.au> | 2012-04-16 01:02:32 +0800 |
| commit | 6bd400db773bb194aa837a6fb03c2992c79975f1 (patch) | |
| tree | 0d7cb8b8469c01ff00db52bafb6560538e9a7057 /sets | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/user/improvise (diff) | |
| download | improvise-6bd400db773bb194aa837a6fb03c2992c79975f1.tar.gz improvise-6bd400db773bb194aa837a6fb03c2992c79975f1.tar.bz2 improvise-6bd400db773bb194aa837a6fb03c2992c79975f1.zip | |
Corrections; authres-0.3, django-xslt-0.4.5, tampakrap-requested-packages
Diffstat (limited to 'sets')
| -rw-r--r-- | sets/tampakrap-requested-packages | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sets/tampakrap-requested-packages b/sets/tampakrap-requested-packages index 5a5ded1..910da17 100644 --- a/sets/tampakrap-requested-packages +++ b/sets/tampakrap-requested-packages @@ -1,4 +1,3 @@ -<<<<<<< HEAD #dev-python/django #dep of django-debug-toolbar, django-auth-ldap, django-compressor, djang-xslt #dev-lang/ruby #dep of kdev-ruby dev-python/dingus #dep of django-debug-toolbar @@ -23,7 +22,6 @@ media-libs/libtvdb #dep of nepomuktvnamer #dev-python/xlwt #dep of xlutils #dev-python/xlrd #dep of xlutils -======= # Django #dev-python/dingus #dep of django-debug-toolbar dev-python/django-auth-ldap @@ -36,7 +34,6 @@ dev-python/feedjack dev-python/xlutils #dev-python/manuel #dep of testfixtures #dev-python/pkginfo #dep of errorhandler ->>>>>>> 3178d221034e720c5a16bd06e06ba9725541ff29 #net-zope/zope-component #dep of testfixtures; test phase # KDE @@ -45,9 +42,6 @@ kde-misc/google-tasks kde-misc/google-contacts-plasmoid kde-misc/nepomuktvnamer kde-misc/nvidiadevicemonitor -<<<<<<< HEAD kde-misc/akonadi-google #dep of google-contacts-plasmoid, google-tasks -======= #media-libs/libtvdb #dep of nepomuktvnamer ->>>>>>> 3178d221034e720c5a16bd06e06ba9725541ff29 |