Merge conflict solved

zzantares · zzantares · commit e7172950bd75 · 2014-07-02T20:53:43.000-05:00
diff --git a/src/Credentials.php b/src/Credentials.php
@@ -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()
     {

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,9 @@ public function getApiUrl()`
`152`	`152`	`* Attempts to login using this credentials, if succeeded will return the`
`153`	`153`	`* AuthToken used in all requests.`
`154`	`154`	`*`
`155`		`- * @return \ProxmoxVE\AuthToken\|bool If login fails will return false`
`156`		`- * otherwise will return the AuthToken.`
	`155`	`+ * @return \ZzAntares\ProxmoxVE\AuthToken\|bool If login fails will return`
	`156`	`+ * false otherwise will return`
	`157`	`+ * the AuthToken.`
`157`	`158`	`*/`
`158`	`159`	`public function login()`
`159`	`160`	`{`