wlan: caf merge marker cleanup
Removed merge markers
Change-Id: I6305e4cd4a536f95580c96b8a26c524c8a791978
diff --git a/CORE/HDD/inc/wlan_hdd_dp_utils.h b/CORE/HDD/inc/wlan_hdd_dp_utils.h
index 7c15955..ac48abd 100644
--- a/CORE/HDD/inc/wlan_hdd_dp_utils.h
+++ b/CORE/HDD/inc/wlan_hdd_dp_utils.h
@@ -33,16 +33,6 @@
\brief Utility functions for data path module
- Description...
- Copyright 2008 (c) Qualcomm, Incorporated.
- All Rights Reserved.
-<<<<<<< HEAD:CORE/HDD/inc/wlan_hdd_dp_utils.h
- Qualcomm Confidential and Proprietary.
-
-=======
- Qualcomm Technologies Confidential and Proprietary.
-
->>>>>>> 009551c... wlan: hdd: remove obsolete "WLAN_SOFTAP_FEATURE" featurization:prima/CORE/HDD/inc/wlan_hdd_dp_utils.h
==============================================================================**/
/* $HEADER$ */
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index 4efd0e9..e9ada2f 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -39,8 +39,6 @@
DESCRIPTION
This file contains the external API exposed by the wlan transport layer
module.
-<<<<<<< HEAD:CORE/TL/inc/wlan_qct_tl.h
->>>>>>> 326d6cf... wlan: remove obsolete ANI_CHIPSET_VOLANS featurization:prima/CORE/TL/inc/wlan_qct_tl.h
===========================================================================*/
diff --git a/CORE/VOSS/inc/vos_mq.h b/CORE/VOSS/inc/vos_mq.h
index 2a18dad..7194e35 100644
--- a/CORE/VOSS/inc/vos_mq.h
+++ b/CORE/VOSS/inc/vos_mq.h
@@ -35,9 +35,6 @@
\brief virtual Operating System Services (vOSS) message queue APIs
Message Queue Definitions and API
-<<<<<<< HEAD:CORE/VOSS/inc/vos_mq.h
-
->>>>>>> f7413b6... wlan: voss: remove obsolete "INTEGRATED_SOC" featurization:prima/CORE/VOSS/inc/vos_mq.h
========================================================================*/
/* $Header$ */
diff --git a/CORE/VOSS/src/vos_timer.c b/CORE/VOSS/src/vos_timer.c
index 6d99c03..73f80bd 100644
--- a/CORE/VOSS/src/vos_timer.c
+++ b/CORE/VOSS/src/vos_timer.c
@@ -32,9 +32,6 @@
\brief virtual Operating System Servies (vOS)
Definitions for vOSS Timer services
-<<<<<<< HEAD:CORE/VOSS/src/vos_timer.c
-
->>>>>>> f7413b6... wlan: voss: remove obsolete "INTEGRATED_SOC" featurization:prima/CORE/VOSS/src/vos_timer.c
========================================================================*/
/* $Header$ */