summaryrefslogtreecommitdiff
path: root/gitlab/v4/objects/project.py
diff options
context:
space:
mode:
Diffstat (limited to 'gitlab/v4/objects/project.py')
-rw-r--r--gitlab/v4/objects/project.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/gitlab/v4/objects/project.py b/gitlab/v4/objects/project.py
index 0ec5f7e..ad22dbb 100644
--- a/gitlab/v4/objects/project.py
+++ b/gitlab/v4/objects/project.py
@@ -1512,8 +1512,6 @@ class PagesDomain(RESTObject):
class PagesDomainManager(ListMixin, RESTManager):
_path = "/pages/domains"
_obj_cls = PagesDomain
-=======
->>>>>>> 509394d... refactor: structure python objects in a reasonable way:gitlab/v4/objects/project.py
class ProjectRegistryRepository(ObjectDeleteMixin, RESTObject):