Randomly merged code

[timewasternl]

When running python main.py, it would greet with an indentation error. Upon checking, there seems to be a wrongly merged call on line 1182 in main.py

https://github.com/bsm3d/Traktor-Bridge/blame/fb7d8d4f95579ac449f5c7ce13d40fd35c00136c/main.py#L1181

[micapam]

Noticed the same problem. I got it working by restoring the lines deleted in the latest commit with the start of the _show_format_menu function in main.py, in the latest commit fb7d8d4

[ericdunn]

I've added a pull request to get this fixed, #7

Cheers,
Eric.

[bsm3d]

Hi,

Fixed for new release 2.1

Thanks,