Projects >> CommunityMashup >>58e80b4a3ac20fc7d8aa5634da92b332cfc8d242

Chunk
Conflicting content
	
	/**
	 * The groups of the authenticated user.
<<<<<<< HEAD
	 * 
	 * http://apidocs.mendeley.com/home/user-specific-methods/user-library-groups
	 */
	public static String GET_USERS_GROUPS 				= MENDELEY_BASE_URL + "groups";
	
	/**
	 * The members of the one users library group.
	 * 
	 * 1: group_id
	 */
	public static String GET_USERS_GROUPS_PEOPLE		= MENDELEY_BASE_URL + "groups/%s/members";
=======
	 */
	public static String GET_USERS_GROUPS 				= MENDELEY_BASE_URL + "groups";
>>>>>>> 0c6b82b593266c8c0e85b47c772b195a93395b9a
	
	/**
	 * The members of one group.
Solution content
	
	/**
	 * The groups of the authenticated user.
	 */
	public static String GET_USERS_GROUPS 				= MENDELEY_BASE_URL + "groups";
	
	/**
	 * The members of one group.
File
MendeleyAPIUrls.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment