Removing more [conflict] comment from WiFi Base files

Bug: 234080262
Change-Id: I514f840f6674cdee454a4950a8a04135beb6c550
1 file changed
tree: 91d7daf8eea9c9f4192c00d7ecb97df06c70afd0
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. LICENSE
  7. OWNERS
  8. PREUPLOAD.cfg