On branch temp
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
	modified:   UI/ViewModels/ModePreferencesViewModel.cs
	modified:   UI/ViewModels/SubmittalViewModel.cs
	modified:   UI/Views/ModePreferencesControl.xaml
	modified:   UI/Views/SubmittalView.xaml
	modified:   Visio/AddIn/BillOfMaterials.cs
	deleted:    Visio/AddIn/CpmtService.cs
	modified:   Visio/AddIn/CsetRibbon.Designer.cs
	modified:   Visio/AddIn/CsetRibbon.cs
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/ContractCSETCreateBOMExport1.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/ContractCSETCreateBOMExportParam1.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/ContractServiceResponse1.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/EnterpriseCore1.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/GetServiceURL1.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/Reference.cs
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/Reference.svcmap
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/RuntimeFault1.wsdl
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.devUnifierCreateBomCPMT.Output.datasource
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.devUnifierCreateBomCPMT.processResponse.datasource
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/UnifierCreateBillOfMaterialReqABCSImpl1.wsdl
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/XxsgLookUpValues.xsd
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/configuration.svcinfo
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/configuration91.svcinfo
	deleted:    Visio/AddIn/Service References/devUnifierCreateBomCPMT/wsse1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/ContractCSETCreateBOMExport1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/ContractCSETCreateBOMExportParam1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/ContractServiceResponse1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/EnterpriseCore1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/GetServiceURL1.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/Reference.cs
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/Reference.svcmap
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/RuntimeFault1.wsdl
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.prodUnifierCreateBomCPMT.Output.datasource
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.prodUnifierCreateBomCPMT.processResponse.datasource
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/UnifierCreateBillOfMaterialReqABCSImpl1.wsdl
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/XxsgLookUpValues.xsd
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/configuration.svcinfo
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/configuration91.svcinfo
	deleted:    Visio/AddIn/Service References/prodUnifierCreateBomCPMT/wsse1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/ContractCSETCreateBOMExport1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/ContractCSETCreateBOMExportParam1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/ContractServiceResponse1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/EnterpriseCore1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/GetServiceURL1.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/Reference.cs
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/Reference.svcmap
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/RuntimeFault1.wsdl
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.qaUnifierCreateBomCPMT.Output.datasource
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.qaUnifierCreateBomCPMT.processResponse.datasource
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/UnifierCreateBillOfMaterialReqABCSImpl1.wsdl
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/XxsgLookUpValues.xsd
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/configuration.svcinfo
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/configuration91.svcinfo
	deleted:    Visio/AddIn/Service References/qaUnifierCreateBomCPMT/wsse1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/ContractCSETCreateBOMExport1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/ContractCSETCreateBOMExportParam1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/ContractServiceResponse1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/EnterpriseCore1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/GetServiceURL1.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/Reference.cs
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/Reference.svcmap
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/RuntimeFault1.wsdl
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.testUnifierCreateBomCPMT.Output.datasource
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/Trane.CSET.Visio.AddIn.testUnifierCreateBomCPMT.processResponse.datasource
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/UnifierCreateBillOfMaterialReqABCSImpl1.wsdl
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/XxsgLookUpValues.xsd
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/configuration.svcinfo
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/configuration91.svcinfo
	deleted:    Visio/AddIn/Service References/testUnifierCreateBomCPMT/wsse1.xsd
	modified:   Visio/Common/DocumentPreferencesManager.cs
	modified:   Visio/Common/GlobalPreferencesManager.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Visio/AddIn/AddPostDeploymentActionToClickOnceInstaller.vbs
	both modified:   Visio/AddIn/Properties/AssemblyInfo.cs
	both modified:   Visio/AddIn/Trane.CSET.Visio.AddIn.csproj
	both modified:   Visio/AddIn/app.config