yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge error

Browse Source
dep_nodyang
wangsr 1 year ago
parent 5ca78fc6ef
commit 3e03c8da8e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml
Unescape Escape View File

@ -25,12 +25,11 @@
<Property name="DbOptionType">None</Property> <Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="AutoGenerateColumns">False</Property>
<Property name="MultiSelect">False</Property> <Property name="MultiSelect">False</Property>
<Property name="Location">348, 12</Property> <Property name="Location">348, 12</Property>
<Property name="Name">MoreData</Property> <Property name="Name">MoreData</Property>
<Property name="Size">330, 622</Property> <Property name="Size">330, 622</Property>
<Property name="TabIndex">8</Property> <Property name="TabIndex">9</Property>
</Object> </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="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"> <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="NightWork" children="Controls">

Write Preview
Loading…
Cancel
Save