mal mergeado

src/FTTHBundle/Form/ONUType.php

@@ -21,12 +21,8 @@ class ONUType extends AbstractType
                 ->add('administrativeState')
                 ->add('currentState')
                 ->add('transitionState')
-<<<<<<< HEAD
-                ->add('tenancyId');
-=======
                 ->add('tenancyId')
                 ;
->>>>>>> 6c6e40a55ca66b75a066bae7765121e9a89259ff
     }
     
     /**