Remove merge conflicts from src/testlink/testlinkapi.py

Fixed the merge conflict on this. The test cases seem to be written for a specific project however.