libbladeRF: Removed stray line from rebase conflict

Stray line introduced in a2fc08371884a5382757fe029a2da9fd87c0212c.