correccion

OSS_SNMP/MIBS/DocsIfCmts.php

@@ -22,7 +22,6 @@ class DocsIfCmts extends \OSS_SNMP\MIB {
     const OID_docsIfSigQMicroreflections        = "1.3.6.1.2.1.10.127.1.1.4.1.6";
     const docsIfCmtsChannelUtilization        = "1.3.6.1.2.1.10.127.1.3.9.1.3";
     const OID_ipNetToMediaPhysAddress 		= "1.3.6.1.2.1.4.22.1.2";
-<<<<<<< HEAD
     const OID_docsIfCmtsCmPtr  			= "1.3.6.1.2.1.10.127.1.3.7.1.2";
 
 
@@ -35,8 +34,6 @@ class DocsIfCmts extends \OSS_SNMP\MIB {
 	}
 	return $ptr;
     }
-=======
->>>>>>> 05cf46a72ee636d27e1753af940af4ff0c8feed0
 
     public function ipNetToMediaPhysAddress(){
 	$rtr = array();
@@ -48,11 +45,7 @@ class DocsIfCmts extends \OSS_SNMP\MIB {
 		$mac = preg_split("|:|", trim(substr($m,8)));
 		$mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x",$mac[0], $mac[1], $mac[2], $mac[3], $mac[4], $mac[5]);
 		$l_ke = count($karray);
-<<<<<<< HEAD
 		$rtr[$mac] = sprintf("%d.%d.%d.%d",$karray[$l_ke - 4],$karray[$l_ke - 3], $karray[$l_ke - 2], $karray[$l_ke-1]);
-=======
-		$rtr[$mac][] = sprintf("%d.%d.%d.%d",$karray[$l_ke - 4],$karray[$l_ke - 3], $karray[$l_ke - 2], $karray[$l_ke-1]);
->>>>>>> 05cf46a72ee636d27e1753af940af4ff0c8feed0
 	}
 	return $rtr;
     }