Home Explore Help
Register Sign In
VendorSoftwareFlowdat3
/
Cablemodem
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

FD3-576 fix conflictos

Luciano Andrade 6 years ago
parent
1ecea423f4
commit
cdc39c3a0e
1 changed files with 0 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      src/CablemodemBundle/Entity/Cablemodem.php

+ 0 - 1
src/CablemodemBundle/Entity/Cablemodem.php
View File 

@@ -485,7 +485,6 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
 
         return $this->cpeFixedIP;
 
         return $this->cpeFixedIP;
 
     }
 
     }
 
     
     
-<<<<<<< HEAD
 
     /**
 
     /**
 
      * @param boolean $cpeFixedIP
 
      * @param boolean $cpeFixedIP
 
      *
 
      *