wlan: caf merge marker cleanup

Removed merge markers

Change-Id: I6305e4cd4a536f95580c96b8a26c524c8a791978
4 files changed
tree: 002b57aedc816ad30d939e4271f69f79944c6145
  1. CORE/
  2. firmware_bin/
  3. riva/
  4. Android.mk
  5. Kbuild
  6. Kconfig