diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-30 18:18:27 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-30 18:18:27 +0200 |
| commit | 62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203 (patch) | |
| tree | 58a7ce6bc30d7e049bf2b4c1aa272306796350eb /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj | |
| parent | 80221695b6c6fd48f7a3e2e70850e68788560b31 (diff) | |
| parent | 71e6a3ec2197eba8b5e1b295914653426064f745 (diff) | |
| download | Tango-62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203.tar.gz Tango-62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203.zip | |
BAD MERGE.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index 3853e6763..012ed8d0d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -103,9 +103,6 @@ <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="Controls\JobOutlineControl.cs" /> - <Compile Include="Controls\JobSummeryViewer.xaml.cs"> - <DependentUpon>JobSummeryViewer.xaml</DependentUpon> - </Compile> <Compile Include="Converters\BrushStopLabToColorConverter.cs" /> <Compile Include="Converters\BrushStopCMYKToColorConverter.cs" /> <Compile Include="Converters\BrushStopToColorConverter.cs" /> @@ -161,10 +158,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Controls\JobSummeryViewer.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\EmbroideryDisplayView.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> @@ -393,7 +386,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |