Resolved merge conflict

This commit is contained in:
Rauno Tuul
2023-04-04 15:50:46 +03:00
10 changed files with 93 additions and 118 deletions

View File

@@ -66,7 +66,7 @@ def domain(domain_name):
current_app.logger.debug("Fetched rrsets: \n{}".format(pretty_json(rrsets)))
# API server might be down, misconfigured
if not rrsets and domain.type != 'Slave':
if not rrsets and domain.type != 'slave':
abort(500)
quick_edit = Setting().get('record_quick_edit')