Removed remaining problems from merge.

[sfa.git] / sfa / managers / registry_manager_slab.py

diff --git a/sfa/managers/registry_manager_slab.py b/sfa/managers/registry_manager_slab.py
index 970dbe8..b30ca93 100644 (file)
--- a/sfa/managers/registry_manager_slab.py
+++ b/sfa/managers/registry_manager_slab.py
@@ -230,7 +230,7 @@ def register(api, record):
         raise ExistingRecord(hrn)
        
     record = SfaRecord(dict = record)
-<<<<<<< HEAD
+
     print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAN.PY  register  SfaRecordrecord %s" %(record)
     #record['authority'] = get_authority(record['hrn'])
     record['authority'] = get_authority(hrn)