hotsanic

Subversion Repositories:

[/] [trunk/] [modules/] [packets/] [diff.txt] - Rev 36 Go to most recent revision

Compare with Previous - Blame - Download

--- .svn/text-base/diagrams.pl.svn-base Sat May  9 09:04:48 2009
+++ .svn/tmp/diagrams.pl.tmp    Tue Aug 14 23:56:44 2012
@@ -83,7 +83,16 @@
     $dbfile=$host."_".$port;
     $dbfile=~ s/\./:/g;

-    } else { $name=$device; $name =~ s/:/_/g; $dbfile=$name; }
+<<<<<<< .mine
+    } else { $name=$device; $name =~ s/:/_/g; $dbfile=$name; $name =~ s/\./_/g;  }
+=======
+    } else {
+    $name=$device;
+    $name =~ s/:/_/g;
+    $dbfile=$name;
+    $name =~ s/\./_/g;
+    }
+>>>>>>> .r21
   }
   # if database exists, create images...
   print "creating images for $device ...\n";