Fixed conflict markers in files that didn't get marked as conflicted for some reason...

Author: wapcaplet

core/admin.py

@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 """Django admin interface for core models.
 """
 
-=======
->>>>>>> FETCH_HEAD
 from django.contrib import admin
 
 from core.models import UserProfile

core/models.py

@@ -4,11 +4,7 @@
 class UserProfile (models.Model):
     """Additional information about a User.
     """
-<<<<<<< HEAD
-    user = models.ForeignKey(User, unique=True)
-=======
     user = models.ForeignKey(User, unique=True, related_name='profile')
->>>>>>> FETCH_HEAD
     whitelisted = models.BooleanField()
     homepage = models.CharField(max_length=100)