# Conflicts: # Swift.DAL/OnlineAgent/OnlineCustomerDao.cs # Swift.web/DashboardV2/Dashboard2.aspx # Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx # Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx # Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs # Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.cs # Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs # Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs # Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs # Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx # Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs # Swift.web/Remit/UserControl/UcTransaction.ascx # Swift.web/Swift.web.csproj # Swift.web/js/swift_calendar.js