diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
index 57e8eb8..a4df6d1 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
@@ -561,11 +561,7 @@
             this.gridColumn21});
             this.DgvOrg.FixedLineWidth = 1;
             this.DgvOrg.GridControl = this.DgcOrg;
-<<<<<<< HEAD
-            this.DgvOrg.IndicatorWidth = 40;
-=======
             this.DgvOrg.IndicatorWidth = 50;
->>>>>>> eb90ebe (1、团体快捷导出，2、编辑信息可以修改出生日期、婚况)
             this.DgvOrg.Name = "DgvOrg";
             this.DgvOrg.OptionsMenu.EnableColumnMenu = false;
             this.DgvOrg.OptionsSelection.MultiSelect = true;