合并解决冲突

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -54,9 +54,9 @@ namespace OTSIncAReportGraph.Controls
       
        MoveSEMToParticle=1,
        CopyImage=2,
-       OriginalSplicing= 3
+       OriginalSplicing= 3,
        DeleteParticle=4,
-       CopyDatabase=5，
+       CopyDatabase=5,
        ParticleSegmentation=6
     }
     /// <summary>

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.Designer.cs

@@ -392,11 +392,7 @@
             this.EXCELToolStripMenuItem,
             this.ToolStripMenuItemDelete_Particle});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-<<<<<<< .mine
             this.contextMenuStrip1.Size = new System.Drawing.Size(219, 310);
-=======
-            this.contextMenuStrip1.Size = new System.Drawing.Size(219, 280);
->>>>>>> .theirs
             // 
             // ToolStripMenuItem1
             // 
@@ -479,21 +475,8 @@
             this.toolStripMenuItem4.Text = "复制图像";
             this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
             // 
-            // toolStripSeparator1
-            // 
-<<<<<<< .mine
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(215, 6);
-            // 
             // ToolStripMenuItem3
             // 
-=======
-
-
-
-
-
->>>>>>> .theirs
             this.ToolStripMenuItem3.Image = global::OTSIncAReportApp.Properties.Resources.恢复;
             this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
             this.ToolStripMenuItem3.Size = new System.Drawing.Size(218, 30);
@@ -526,7 +509,6 @@
             // 
             // testToolStripMenuItem
             // 
-<<<<<<< .mine
             this.testToolStripMenuItem.Name = "testToolStripMenuItem";
             this.testToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
             this.testToolStripMenuItem.Text = "显示能谱数据";
@@ -535,29 +517,13 @@
             // 
             // EXCELToolStripMenuItem
             // 
-=======
-
-
-
-
-
-
-
-
->>>>>>> .theirs
             this.EXCELToolStripMenuItem.Image = global::OTSIncAReportApp.Properties.Resources.导出所有数据到EXCEL321;
             this.EXCELToolStripMenuItem.Name = "EXCELToolStripMenuItem";
             this.EXCELToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
             this.EXCELToolStripMenuItem.Text = "导出EXCEL";
             this.EXCELToolStripMenuItem.Click += new System.EventHandler(this.EXCELToolStripMenuItem_Click);
-            // 
-<<<<<<< .mine
+            
             // ToolStripMenuItemDelete_Particle
-=======
-            // ParticlesGridDevidePage
->>>>>>> .theirs
-            // 
-<<<<<<< .mine
             this.ToolStripMenuItemDelete_Particle.Name = "ToolStripMenuItemDelete_Particle";
             this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(218, 30);
             this.ToolStripMenuItemDelete_Particle.Text = "Delete particles";
@@ -600,50 +566,6 @@
             // ParticlesGridDevidePage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-=======
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.tableLayoutPanel1);
             this.Name = "ParticlesGridDevidePage";
@@ -703,10 +625,7 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.ToolStripMenuItem EXCELToolStripMenuItem;
         private System.Windows.Forms.DataGridView dgV_ParticlesDevidePage;
-<<<<<<< .mine
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemDelete_Particle;
-=======
         private System.Windows.Forms.Button btn_ReMeasure;
->>>>>>> .theirs
     }
 }