removed unused import

Author: saadmk11

readthedocs/core/views/serve.py

@@ -38,11 +38,7 @@
 from django.views.decorators.cache import cache_page
 from django.views.static import serve
 
-<<<<<<< HEAD
 from readthedocs.builds.constants import LATEST, STABLE
-=======
-from readthedocs.builds.constants import INTERNAL
->>>>>>> Manager names moved to Constants
 from readthedocs.builds.models import Version
 from readthedocs.core.permissions import AdminPermission
 from readthedocs.core.resolver import resolve, resolve_path