Fix merge conflict

readthedocs · Feb 4, 2019 · 03043d6 · 03043d6
1 parent bf380bc
commit 03043d6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/readthedocs/rtd_tests/tests/test_doc_serving.py b/readthedocs/rtd_tests/tests/test_doc_serving.py
@@ -12,7 +12,8 @@
 
 from readthedocs.core.views.serve import _serve_symlink_docs
 from readthedocs.builds.constants import STABLE
-from readthedocs.builds.models import Versionfrom readthedocs.projects import constants
+from readthedocs.builds.models import Version
+from readthedocs.projects import constants
 from readthedocs.projects.models import Project
 from readthedocs.rtd_tests.base import RequestFactoryTestMixin