Update definitions.inc.php

removed conflict.
2026-07-12 16:06:25 +02:00 · 2015-07-07 10:04:10 +01:00
parent 7ab690f45e
commit 76dee75612
1 changed files with 0 additions and 4 deletions
@@ -1189,11 +1189,7 @@ foreach ($config['os'] as $this_os => $blah)
  }
 }

-<<<<<<< HEAD
-// Meraki
-=======
 // Meraki Devices
->>>>>>> 8b9323852cb4acdbedecca17c7a1a2fc8a53155f
 $os = "merakimx";
 $config['os'][$os]['text']              = "Meraki MX Appliance";
 $config['os'][$os]['type']              = "firewall";