Bladeren bron

合并问题处理

CXS 3 jaren geleden
bovenliggende
commit
bd668b1cb9
2 gewijzigde bestanden met toevoegingen van 7 en 6 verwijderingen
  1. 7 5
      OTSIncAMeasureApp/OTSIncAMeasureApp.csproj
  2. 0 1
      OTSIncAMeasureApp/OTSIncAMeasureAppForm.resx

+ 7 - 5
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -237,14 +237,16 @@
     <Compile Include="0-OTSModel\OTSDataType\SEMStageData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XmlResourceData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XMLSerialization.cs" />
-    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.cs">
     <Compile Include="5-OTSMeasureStatuImageFun\frmSpecialGrayParticle.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="5-OTSMeasureStatuImageFun\frmSpecialGrayParticle.Designer.cs">
       <DependentUpon>frmSpecialGrayParticle.cs</DependentUpon>
     </Compile>
-	<Compile Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.Designer.cs">
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.Designer.cs">
       <DependentUpon>DlgStageEdit.cs</DependentUpon>
     </Compile>
     <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageMgr.cs">
@@ -441,13 +443,13 @@
     </EmbeddedResource>
     <EmbeddedResource Include="1-OTSMeasure\MeasureCheckResultInfoWindow.resx">
       <DependentUpon>MeasureCheckResultInfoWindow.cs</DependentUpon>
-    </EmbeddedResource>
-     <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.resx">
-      <DependentUpon>DlgStageEdit.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="5-OTSMeasureStatuImageFun\frmSpecialGrayParticle.resx">
       <DependentUpon>frmSpecialGrayParticle.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageEdit.resx">
+      <DependentUpon>DlgStageEdit.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageMgr.resx">
       <DependentUpon>DlgStageMgr.cs</DependentUpon>
     </EmbeddedResource>

+ 0 - 1
OTSIncAMeasureApp/OTSIncAMeasureAppForm.resx

@@ -154,7 +154,6 @@
         JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
-  </data>
 
   <data name="ribbonOrbRecentItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>