diff options
author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-21 17:43:05 +0100 |
---|---|---|
committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-21 17:43:05 +0100 |
commit | aa8804719c7930181aa7a0af41ca5b983fdf5be4 (patch) | |
tree | ba3f8a30d3b72e6b29bdd71823df2c33d4bb2b27 /setup.py | |
parent | 6c2e57304c302acfc005686515ce91d91727dd8d (diff) | |
parent | 99812bbc4a76735824708b341ea283f09a1b423c (diff) | |
download | mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.tar.lz mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.tar.xz mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.zip |
Resolve merge conflicts
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -62,6 +62,8 @@ setup( 'webtest', 'ConfigObj', 'Markdown', + 'sqlalchemy', + 'sqlalchemy-migrate', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', |