Erase the merging conflicts writings

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -248,11 +248,8 @@
 "Active" = "Active";
 "Move Up" = "Move Up";
 "Move Down" = "Move Down";
-<<<<<<< HEAD
-=======
 "ConnectionError" = "Connection error";
 "ServiceTemporarilyUnavailable" = "Service temporarily unavailable";
->>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
 
 /* Filters - UIxFilterEditor */
 "Filter name:" = "Filter name:";

UI/PreferencesUI/UIxPreferences.m

@@ -1140,61 +1140,27 @@ static NSArray *reminderValues = nil;
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;
-  WORequest *request;
   SOGoDomainDefaults *dd;
-<<<<<<< HEAD
-  NSString *method;
-
-  request = [context request];
-  if ([[request method] isEqualToString: @"POST"])
-    {
-      SOGoMailAccount *account;
-      SOGoMailAccounts *folder;
-
-      dd = [[context activeUser] domainDefaults];
-      if ([dd sieveScriptsEnabled])
-        [userDefaults setSieveFilters: sieveFilters];
-      if ([dd vacationEnabled])
-        [userDefaults setVacationOptions: vacationOptions];
-      if ([dd forwardEnabled])
-        [userDefaults setForwardOptions: forwardOptions];
-
-=======
   SOGoMailAccount *account;
   SOGoMailAccounts *folder;
   WORequest *request;
-
+  
   request = [context request];
   if ([[request method] isEqualToString: @"POST"]){
     dd = [[context activeUser] domainDefaults];
     if ([dd sieveScriptsEnabled])
-      [userDefaults setSieveFilters: sieveFilters];
+    [userDefaults setSieveFilters: sieveFilters];
     if ([dd vacationEnabled])
-      [userDefaults setVacationOptions: vacationOptions];
+    [userDefaults setVacationOptions: vacationOptions];
     if ([dd forwardEnabled])
-      [userDefaults setForwardOptions: forwardOptions];
-  
+    [userDefaults setForwardOptions: forwardOptions];
+    
     if([self isSieveServerAvailable]){
->>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
       [userDefaults synchronize];
-
       folder = [[self clientObject] mailAccountsFolder: @"Mail"
                                              inContext: context];
       account = [folder lookupName: @"0" inContext: context acquire: NO];
-      [account updateFilters];
-
-<<<<<<< HEAD
-      if (hasChanged)
-        method = @"window.location.reload()";
-      else
-        method = nil;
-
-      results = [self jsCloseWithRefreshMethod: method];
-    }
-  else
-    results = self;
-
-=======
+      
       if([account updateFilters]){
         results = [self responseWithStatus: 200 andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
       }
@@ -1210,7 +1176,6 @@ static NSArray *reminderValues = nil;
     results = self;
   }
   
->>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
   return results;
 }
 

UI/WebServerResources/UIxPreferences.js

@@ -80,13 +80,6 @@ function savePreferences(sender) {
     }
 
     if (sendForm) {
-<<<<<<< HEAD
-        saveMailAccounts();
-        $("mainForm").submit();
-    }
-
-    return false;
-=======
    	saveMailAccounts();
       
     triggerAjaxRequest($("mainForm").readAttribute("action"), function (http) {
@@ -111,8 +104,6 @@ function savePreferences(sender) {
       { "Content-type": "application/x-www-form-urlencoded" });
 	}
   return false;
-  
->>>>>>> a005b93... bug 1046 finished, if sieve server is not responding an error message will appear
 }
 
 function prototypeIfyFilters() {