# Conflicts:
#	tupak/core/result.py
#	tupak/gw/detector.py
#	tupak/gw/utils.py

Time domain data

See merge request Monash/tupak!105

# Conflicts:
#   tupak/gw/detector.py

Triangular detector

See merge request Monash/tupak!101

Did the same restructuring in _infer_frequency_domain_dependance as in _infer_time_domain_dependance

Removed the `_check_maximum_frequency` method and moved the logic into the `maximum_frequency` @property