From 76dee7561219a705122954a65e192cc1af1c7f19 Mon Sep 17 00:00:00 2001
From: Will Jones <email@willjones.eu>
Date: Tue, 7 Jul 2015 10:04:10 +0100
Subject: [PATCH] Update definitions.inc.php

removed conflict.
---
 includes/definitions.inc.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 16b4dcde0..1140ad6aa 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -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";