Skip to content

Commit

Permalink
Merge conflict solved
Browse files Browse the repository at this point in the history
  • Loading branch information
zzantares committed Jul 3, 2014
2 parents 7e33cdf + 4c148b1 commit e717295
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/Credentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ public function getApiUrl()
* Attempts to login using this credentials, if succeeded will return the
* AuthToken used in all requests.
*
* @return \ProxmoxVE\AuthToken|bool If login fails will return false
* otherwise will return the AuthToken.
* @return \ZzAntares\ProxmoxVE\AuthToken|bool If login fails will return
* false otherwise will return
* the AuthToken.
*/
public function login()
{
Expand Down

0 comments on commit e717295

Please sign in to comment.