Projects >> spring-social-facebook >>569b045b283039820887827823206e51611b86a8

Chunk
Conflicting content
	
	/**
	 * Returns the underlying {@link RestOperations} object allowing for consumption of Facebook endpoints that may not be otherwise covered by the API binding.
<<<<<<< HEAD
	 * The RestOperations object returned is configured to include an OAuth 2 "Authorization" header on all requests.
	 */
	RestOperations restOperations();

=======
	 * The RestOperations object returned is configured to include and OAuth 2 "Authorization" header on all requests.
	 */
	RestOperations restOperations();
>>>>>>> e45b6254ba4e63a360d8a09ddbbd2097bf7a1a17
}
Solution content
	
	/**
	 * Returns the underlying {@link RestOperations} object allowing for consumption of Facebook endpoints that may not be otherwise covered by the API binding.
	 * The RestOperations object returned is configured to include an OAuth 2 "Authorization" header on all requests.
	 */
	RestOperations restOperations();

}
File
Facebook.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface