updated TLS.php

2019-02-23 00:18:05 +00:00
parent 910644f88d
commit f105d38d85
1 changed files with 1 additions and 4 deletions
--- a/src/Endpoints/TLS.php
+++ b/src/Endpoints/TLS.php
@@ -67,7 +67,6 @@ class TLS implements API

        return false;
    }
-<<<<<<< HEAD
    public function getHTTPSRedirectStatus($zoneID) {
        $return = $this->adapter->get(
            'zones/' . $zoneID . '/settings/always_use_https'
@@ -122,6 +121,4 @@ class TLS implements API

        return false;
    }
-=======
->>>>>>> 4694904b38fdf5f251559a473cecf77a63cf9202
-}
+}