diff options
| author | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
| commit | 927dde01a827a91a24495bd868575cefd981f8c2 (patch) | |
| tree | f09ed178937f28b85d1499951cff3faa64988250 /src/main/java/eu/siacs/conversations/services | |
| parent | 67eb44af3c5012cdc2da3af4ae94cf7fa51a3ef1 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index dea0b1e3e..277f0667b 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -665,7 +665,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } private void resetAllAttemptCounts(boolean reallyAll) { - Log.d(Config.LOGTAG, "resetting all attepmt counts"); + Log.d(Config.LOGTAG, "resetting all attempt counts"); for (Account account : accounts) { if (account.hasErrorStatus() || reallyAll) { final XmppConnection connection = account.getXmppConnection(); |