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

解决合并冲突——wangsr+dep_yangw

Browse Source
master
wangsr 1 year ago
parent b19a0c0b27
commit 2b5fccc5e8
2 changed files with 2 additions and 7707 deletions
Show Stats Download Patch File Download Diff File

6
Main/MCEdit/Data/MCProject/nodeDataSource.xml
Unescape Escape View File

@ -1,7 +1,5 @@
<DataSources> <DataSources>
<<<<<<< HEAD
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="192.168.0.125" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" /> <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="192.168.0.125" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
=======
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="10.11.41.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
>>>>>>> dep_yangw
</DataSources> </DataSources>

7703
Main/MCEdit/Data/MCProject/nodeDevice.xml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save