Skip to content

Commit

Permalink
Merge pull request #533 from chhantyal/master
Browse files Browse the repository at this point in the history
One extra line keeps 1.6 support
  • Loading branch information
tschellenbach committed May 5, 2015
2 parents bde48c8 + d91af29 commit d31eb10
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion django_facebook/models.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from __future__ import unicode_literals
from django.utils.encoding import python_2_unicode_compatible
from django.conf import settings
from django.contrib.contenttypes.fields import GenericForeignKey
try:
from django.contrib.contenttypes.fields import GenericForeignKey
except ImportError:
from django.contrib.contenttypes.generic import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.db.models.base import ModelBase
Expand Down

0 comments on commit d31eb10

Please sign in to comment.