commit 4e98b87d0849fe6731830c2b9d1d8db923b13717
author Jamie Hannaford <jamie.hannaford@rackspace.com> Mon Oct 06 15:27:19 2014 +0200
committer Jamie Hannaford <jamie.hannaford@rackspace.com> Tue Oct 07 10:11:06 2014 +0200
tree 3969a54a16c5e30bd0a9cdb67798d9eccf6be9a1
parent 2ff3ea917cfa212db3cdd7f74df91c452d521817

Renaming erroneous test files

openstack/networking/v2/subnets/urls_test.go

diff --git a/openstack/networking/v2/subnets/urls_test.go b/openstack/networking/v2/subnets/urls_test.go
index aeeddf3..ba1515f 100644
--- a/openstack/networking/v2/subnets/urls_test.go
+++ b/openstack/networking/v2/subnets/urls_test.go
@@ -10,7 +10,11 @@
 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) {