Removing merge conflicts :fist:
diff --git a/openstack/networking/v2/ports/urls_test.go b/openstack/networking/v2/ports/urls_test.go
index e36e9ae..7fadd4d 100644
--- a/openstack/networking/v2/ports/urls_test.go
+++ b/openstack/networking/v2/ports/urls_test.go
@@ -10,11 +10,7 @@
const endpoint = "http://localhost:57909/"
func endpointClient() *gophercloud.ServiceClient {
-<<<<<<< HEAD
return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
-=======
- return &gophercloud.ServiceClient{Endpoint: endpoint}
->>>>>>> Renaming erroneous test files
}
func TestListURL(t *testing.T) {
diff --git a/openstack/networking/v2/subnets/urls_test.go b/openstack/networking/v2/subnets/urls_test.go
index ba1515f..aeeddf3 100644
--- a/openstack/networking/v2/subnets/urls_test.go
+++ b/openstack/networking/v2/subnets/urls_test.go
@@ -10,11 +10,7 @@
const endpoint = "http://localhost:57909/"
func endpointClient() *gophercloud.ServiceClient {
-<<<<<<< HEAD
return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
-=======
- return &gophercloud.ServiceClient{Endpoint: endpoint}
->>>>>>> Renaming erroneous test files
}
func TestListURL(t *testing.T) {