Resolved merge conflict with actmgr/frmActivityMgr.h

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 45f56fb..55458b1 100644 (file)
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -69,6 +69,16 @@ struct SSLInvalidTrustNotifObj{
 };
 #endif
 
+struct ActivityMgrAccountSettings{
+       wxString Address;
+       int Port;
+       wxString Username;
+       wxString Password;
+       bool SSL;
+       wxString Prefix;
+       wxString Dir;
+};
+
 /** Implementing frmActivityMgrADT */
 class frmActivityMgr : public frmActivityMgrADT
 {
@@ -90,6 +100,7 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,wxString> ActivityListFilename;
                std::map<int,wxString> ActivityListFullFilename;
                std::map<int,CardDAV*> ActivityListConn;
+               std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
                std::map<int,wxString> ActivityListETag;
                std::map<int,wxString> ActivityListETagOriginal;
                std::map<int,wxDateTime> ActivityListFinDate;