Fix merge conflict

2015-11-17 11:37:50 +00:00
parent 6d7156e309
commit 0163700414
2 changed files with 0 additions and 12 deletions
--- a/client/sql/90_permissions_test.sql
+++ b/client/sql/90_permissions_test.sql
@@ -23,6 +23,3 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol',
 SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell');
 SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
 SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
-
-- Check the regular user cannot look into config table
-SELECT * from cdb_geocoder_client._config;