Resolved merge conflict with actmgr/frmActivityMgr.h

diff --cc source/actmgr/frmActivityMgr.h
index 45f56fb,493bdd1..55458b1
--- 1/source/actmgr/frmActivityMgr.h
--- 2/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@@ -60,15 -55,16 +60,25 @@@ struct ActivityMgrLabelUpdate
        wxString ItemDes;
  };
  
 +#if defined(__APPLE__)
 +struct SSLInvalidTrustNotifObj{
 +        SecTrustRef SecurityTrustObject;
 +        int *ResultValue;
 +        bool *PausePtr;
 +        wxString AccountName;
 +};
 +#endif
 +
+ struct ActivityMgrAccountSettings{
+       wxString Address;
+       int Port;
+       wxString Username;
+       wxString Password;
+       bool SSL;
+       wxString Prefix;
+       wxString Dir;
+ };
+ 
  /** Implementing frmActivityMgrADT */
  class frmActivityMgr : public frmActivityMgrADT
  {