Nothing hurts any more...

The continuing dispute between Qualcomm and Apple has resulted in both giant firms stalling the divorce agreement and patching things up.