Remove duplicate lines
Merge pull request #7 from apiaryio/abtris/remove-conflicted-lines

Remove duplicate lines