merge
This commit is contained in:
@ -1,5 +1,8 @@
|
||||
<Properties StartupItem="Snmp2Mysql/Snmp2Mysql.csproj">
|
||||
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
|
||||
<<<<<<< local
|
||||
<MonoDevelop.Ide.Workbench />
|
||||
=======
|
||||
<MonoDevelop.Ide.Workbench ActiveDocument="Snmp2Mysql/Program.cs">
|
||||
<Files>
|
||||
<File FileName="Snmp2Mysql/DatabaseLink.cs" Line="1" Column="1" />
|
||||
@ -7,6 +10,7 @@
|
||||
<File FileName="Snmp2Mysql/SnmpGetter.cs" Line="1" Column="1" />
|
||||
</Files>
|
||||
</MonoDevelop.Ide.Workbench>
|
||||
>>>>>>> other
|
||||
<MonoDevelop.Ide.DebuggingService.Breakpoints>
|
||||
<BreakpointStore />
|
||||
</MonoDevelop.Ide.DebuggingService.Breakpoints>
|
||||
|
Reference in New Issue
Block a user