-merge

2015-10-13 23:12:50 +02:00
parent 7b0d33af38
commit 653291ea1a
4 changed files with 79 additions and 56 deletions
--- a/Snmp2Mysql.userprefs
+++ b/Snmp2Mysql.userprefs
@ -1,11 +1,15 @@
 <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="12" Column="6" />
    </Files>
  </MonoDevelop.Ide.Workbench>
+>>>>>>> other
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>