conflict resolution

testing_api.rst

@@ -7,8 +7,11 @@ Here are some screenshots of how to do it :
 
 1/ Create an authentification request :
 With url : https://apis.goflipr.com/OAuth2/token
+
 Set the grant_type parameter to password
+
 Set the username parameter to your email adress of the flipr app
+
 Set the password parameter to your password value
 
 Retrieve the bearer token from the "access_token" value of the result.
@@ -18,7 +21,9 @@ Retrieve the bearer token from the "access_token" value of the result.
 
 2/ Create a get resume request :
 With url : https://apis.goflipr.com/modules/XXXXX/NewResume
+
 Replace XXXXX with your flipr ID
+
 Set the bearer token got from the previous response
 
 You should have a result with the data like :