Skip to content
This repository has been archived by the owner on Feb 13, 2019. It is now read-only.

Commit

Permalink
Fuck this six bullshit
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Sinchok committed May 3, 2014
1 parent d5cbacc commit 51ddc39
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions betty/conf/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
from __future__ import unicode_literals

import os
import six.moves.urllib
from six.moves.urllib.parse import urljoin
try:
from urlparse import urljoin
except ImportError:
from urllib.parse import urljoin

from django.conf import settings as _settings

Expand Down

0 comments on commit 51ddc39

Please sign in to comment.