bff4f49b7a
Conflicts: lib/Doctrine/Common/Annotations/AnnotationReader.php lib/Doctrine/Common/Annotations/Parser.php
The file is empty.