From 900c4b625b62a6c1f4a16bfe8d6b5d77480427ff Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 10 Oct 2012 09:50:15 +0100
Subject: api_key -> auth_token to avoid TastyPie conflict

---
 rest_framework/authtoken/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/authtoken/models.py')

diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py
index f7e78ef3..5b3071aa 100644
--- a/rest_framework/authtoken/models.py
+++ b/rest_framework/authtoken/models.py
@@ -9,7 +9,7 @@ class Token(models.Model):
     The default authorization token model.
     """
     key = models.CharField(max_length=40, primary_key=True)
-    user = models.OneToOneField('auth.User', related_name='api_key')
+    user = models.OneToOneField('auth.User', related_name='auth_token')
     created = models.DateTimeField(auto_now_add=True)
 
     def save(self, *args, **kwargs):
-- 
cgit v1.2.3