Development (#47)

Fix merge error

sat_export.py

@@ -51,14 +51,6 @@ def get_cv(org_id):
 
             # Return the ID (should be '1') and the label (forms part of the export path name)
             return cv_result['id'], cv_ver, cv_result['label']
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> master
-=======
-
->>>>>>> e2448ba67fb918a5a4a04d1d3811f9f91b579239
 
 # Promote a content view version
 def export_cv(dov_ver, last_export, export_type):
@@ -1150,15 +1142,6 @@ def main(args):
                         backend_id = repo_result['backend_identifier']
                     else:
                         backend_id = repo_result['label']
-<<<<<<< HEAD
-=======
-
-                    # Satellite 6.3 uses a new backend_identifier key in the API result
-                    if 'backend_identifier' in repo_result:
-                        backend_id = repo_result['backend_identifier']
-                    else:
-                        backend_id = repo_result['label']
->>>>>>> master
 
                     if ok_to_export:
                         # Trigger export on the repo