Compatibility new FOSUserBundle

PUGX / PUGXMultiUserBundle

An extension for FOSUserBundle to handle users of different types. Compatible with Doctrine ORM.

163 stars 96 forks source link

Closed Thibault34 closed 7 years ago

garak commented 7 years ago

Can you resolve conflicts?

Thibault34 commented 7 years ago

I don't understand wich conflict ? orm.yml ? evrything ok Can you explain please ?

garak commented 7 years ago

It looks like you started your PR before pulling, but this is just a wild guess.

Thibault34 commented 7 years ago

I can't resolve

garak commented 7 years ago

So close this PR and start a new one