akeneo/pim-community-dev — pull request #1101 by solivier (2014-05-28 12:53:15+00:00)
Title: Removed merge issue in the attribute type definition

| Q | A
| ------------------- | ---
| Bug fix? | Yes
| New feature? | No
| BC breaks? | No
| Tests pass? | Yes
| Scenarios pass? | ?
| Checkstyle issues? | No
| Changelog updated? | No
| Fixed tickets | No
| Doc PR | No