# Conflicts: # Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs # Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs # Swift.DAL/app.config # Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs # Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js # Swift.web/Library/PasswordGenerator.cs # Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs # Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs # Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs # Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.cs # Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs # Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs # Swift.web/Swift.web.csproj # Swift.web/SwiftSystem/UserManagement/AgentSetup/Manage.aspx.designer.cs # Swift.web/Web.config