6 年之前 · cdc39c3a0e
--- a/src/CablemodemBundle/Entity/Cablemodem.php
+++ b/src/CablemodemBundle/Entity/Cablemodem.php
@@ -485,7 +485,6 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
 
				         return $this->cpeFixedIP;
			
 
				     }
			
 
				     
			
 
				-<<<<<<< HEAD
			
 
				     /**
			
 
				      * @param boolean $cpeFixedIP
			
 
				      *