From 3e03c8da8e4194b783863b6b110dcc68fd8d9cd9 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Wed, 18 Oct 2023 04:46:43 +0800
Subject: [PATCH] merge error

---
 Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml
index 29b63cf..4c457c5 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml
@@ -25,12 +25,11 @@
       <Property name="DbOptionType">None</Property>
       <Property name="MCVisible">True</Property>
       <Property name="MCEnabled">True</Property>
-      <Property name="AutoGenerateColumns">False</Property>
       <Property name="MultiSelect">False</Property>
       <Property name="Location">348, 12</Property>
       <Property name="Name">MoreData</Property>
       <Property name="Size">330, 622</Property>
-      <Property name="TabIndex">8</Property>
+      <Property name="TabIndex">9</Property>
     </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox1" children="Controls">
       <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="NightWork" children="Controls">