This commit is contained in:
Wolfgang Hottgenroth
2015-10-17 22:40:25 +02:00
parent 0b094b8df2
commit 7345073bb0
3 changed files with 59 additions and 37 deletions

View File

@ -1,16 +1,10 @@
<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" />
<File FileName="Snmp2Mysql/Program.cs" Line="20" Column="60" />
<File FileName="Snmp2Mysql/SnmpGetter.cs" Line="1" Column="1" />
<File FileName="Snmp2Mysql/Program.cs" Line="16" Column="2" />
</Files>
</MonoDevelop.Ide.Workbench>
>>>>>>> other
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>