From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 9 Apr 2016 07:53:16 +0000 (+0100)
Subject: Resolved merge conflict with actmgr/frmActivityMgr.h
X-Git-Tag: release-0.12~22
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=17ceb4e3a5a0b0fdb902775773699bfbbccc7b5c

Resolved merge conflict with actmgr/frmActivityMgr.h
---

17ceb4e3a5a0b0fdb902775773699bfbbccc7b5c
diff --cc source/actmgr/frmActivityMgr.h
index 45f56fb,493bdd1..55458b1
--- a/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
  {