aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-19 01:44:26 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-19 01:44:26 +0200
commit76e21adbd8756159d83bef99b335398519b338f3 (patch)
tree3c8c6b179cea2fa2ba70dc039ef2c0f63ab09a98 /mediagoblin
parentd81b39da4c0f67b5f1c02da31f2c671aaca39624 (diff)
parentf2f3fe33e90ae7bc2f621bbd3cb003e098d130c8 (diff)
downloadmediagoblin-76e21adbd8756159d83bef99b335398519b338f3.tar.lz
mediagoblin-76e21adbd8756159d83bef99b335398519b338f3.tar.xz
mediagoblin-76e21adbd8756159d83bef99b335398519b338f3.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/tests/test_celery_setup.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index 558eb458..2a7601c7 100644
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -14,8 +14,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import pkg_resources
-
from mediagoblin import celery_setup