Merge cleanup

core/registrar.py

@@ -196,14 +196,10 @@ class RegistrationError(Exception):
 
 @transaction.atomic
 def registrar(
-<<<<<<< core/registrar.py
-    collection,
-    objects_prefix, upload_container, replace=False, client=None, registered_set_key=None,
-    reporting_dir=None, service_url=None
-=======
     collection_stack,
-    objects_prefix, upload_container=None, replace=False, client=None, registered_set_key=None
->>>>>>> core/registrar.py
+    objects_prefix, upload_container=None, replace=False, client=None, registered_set_key=None,
+    reporting_dir=None, service_url=None
+
 ):
     logger.info("Starting registration of product '%s'." % objects_prefix)