Fix merge

This commit is contained in:
Alexandre Cloutier
2014-04-09 10:35:10 -04:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -34,7 +34,7 @@
id item;
SOGoUser *user;
NGSieveClient *client;
// Addressbook
NSMutableDictionary *addressBooksIDWithDisplayName;
+1
View File
@@ -181,6 +181,7 @@ static NSArray *reminderValues = nil;
[forwardOptions release];
[daysOfWeek release];
[addressBooksIDWithDisplayName release];
[client release];
[super dealloc];
}