diff options
| author |  Pushkar Singh <pushkar@hothouselabs.com> | 2013-07-03 15:03:54 -0700 |
|---|---|---|
| committer | Pushkar Singh <pushkar@hothouselabs.com> | 2013-07-03 15:03:54 -0700 |
| commit | ca0de9d28e8331e38b8ce10791fbbab266281a16 (patch) | |
| tree | 950c2c2204514439f978e6c54228941431fba752 | |
| parent | 9fe6ce12c4880a6c2f2a4180752987dd30d65c89 (diff) | |
| parent | aefac083c0553f0a71f808eea1d93458496e026e (diff) | |
Merge branch 'master' of github.com:pushkarsingh/mailcore2
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/async/imap/MCIMAPCheckAccountOperation.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -8,3 +8,4 @@ project.xcworkspace example/ios/iOS UI Test/DerivedData scripts/prebuilt.list +build/ diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index 78c95d52..2e3ddbd9 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -1,4 +1,4 @@ -// +x// // MCIMAPCheckAccountOperation.h // mailcore2 // |