aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/test_serializer_nested.py
diff options
context:
space:
mode:
authorTom Christie2014-01-13 17:38:03 +0000
committerTom Christie2014-01-13 17:38:03 +0000
commite91d0a69ab404a79da1dd5d0806d33e972a1a09b (patch)
tree16b002eeed52d39b7d803cb62c606edbddd821e9 /rest_framework/tests/test_serializer_nested.py
parentd937ce331cc6cd2df04a989b49cca030f65319da (diff)
parentc4d77667cf80588a2195fdc025bda53a5b977105 (diff)
downloaddjango-rest-framework-e91d0a69ab404a79da1dd5d0806d33e972a1a09b.tar.bz2
Merge branch 'testing-nested-serializers' of git://github.com/dustinfarris/django-rest-framework into dustinfarris-testing-nested-serializers
Diffstat (limited to 'rest_framework/tests/test_serializer_nested.py')
-rw-r--r--rest_framework/tests/test_serializer_nested.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py
index 7114a060..6d69ffbd 100644
--- a/rest_framework/tests/test_serializer_nested.py
+++ b/rest_framework/tests/test_serializer_nested.py
@@ -345,4 +345,3 @@ class NestedModelSerializerUpdateTests(TestCase):
result = deserialize.object
result.save()
self.assertEqual(result.id, john.id)
-