Fix: conflict in rest api

diff --cc rest/__init__.py
index 7bcd8ed,c463463..38c1c44
--- 1/rest/__init__.py
--- 2/rest/__init__.py
+++ b/rest/__init__.py
@@@ -89,8 -91,11 +91,13 @@@ def resource(request, object_name, obje
      return send(request, execute_query(request, query), object_properties)
  
  def user(request, object_name, object_properties, object_filters = None):
 -    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn')
 +#    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
 +    query = Query().get('user').filter_by('parent_authority', '==', 'ple.upmc').select(object_properties)
++    #query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn')
+     if object_filters :
+         for k, f in object_filters.iteritems() :
+             query.filter_by(k, '==', f)
+     query.select(object_properties)
      return send(request, execute_query(request, query), object_properties)
  
  def send(request, response, object_properties):