build manager tests added

Author: saadmk11

readthedocs/rtd_tests/tests/test_managers.py

@@ -2,7 +2,11 @@
 from django.test import TestCase
 from django_dynamic_fixture import get
 
+<<<<<<< HEAD
 from readthedocs.builds.constants import EXTERNAL, BRANCH, TAG
+=======
+from readthedocs.builds.constants import PULL_REQUEST, BRANCH, TAG
+>>>>>>> build manager tests added
 from readthedocs.builds.models import Version, Build
 from readthedocs.projects.constants import PUBLIC, PRIVATE, PROTECTED
 from readthedocs.projects.models import Project