projects
/
zukebox
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Performing merge
[zukebox]
/
zukebox_server
/
setup.py
diff --git
a/zukebox_server/setup.py
b/zukebox_server/setup.py
index
4cf9ed9
..
45de651
100644
(file)
--- a/
zukebox_server/setup.py
+++ b/
zukebox_server/setup.py
@@
-32,7
+32,7
@@
def main():
packages=['zukebox_server',
'zukebox_server/services',
'zukebox_server/services/playlist',
- 'zukebox_server/plugins',
+ 'zukebox_sever/plugins',
'zukebox_server/plugins/audio_library',
'zukebox_server/system',
'zukebox_server/server',