updated TLS.php
This commit is contained in:
@@ -67,7 +67,6 @@ class TLS implements API
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
public function getHTTPSRedirectStatus($zoneID) {
|
public function getHTTPSRedirectStatus($zoneID) {
|
||||||
$return = $this->adapter->get(
|
$return = $this->adapter->get(
|
||||||
'zones/' . $zoneID . '/settings/always_use_https'
|
'zones/' . $zoneID . '/settings/always_use_https'
|
||||||
@@ -122,6 +121,4 @@ class TLS implements API
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
>>>>>>> 4694904b38fdf5f251559a473cecf77a63cf9202
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user