commit 71c321ca39417e8bef29af7e11ca85c488641e59
author Gopichand Nakkala <gnakkala@qca.qualcomm.com> Thu Mar 07 12:05:28 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Thu Mar 07 12:05:28 2013 -0800
tree 80ea2bd0988c99027d9a97f88fcd6a47f60687dd
parent d5f8685eec30f5679b48e09d7a8157ea4e82f3ed

wlan:(2)Fixing issue with voss: remove obsolete "INTEGRATED_SOC" featurization

CORE/VOSS/src/vos_api.c

diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index b803585..09ab701 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -45,15 +45,6 @@
   \file  vos_api.c
 
   \brief Stub file for all virtual Operating System Services (vOSS) APIs
-<<<<<<< HEAD:CORE/VOSS/src/vos_api.c
-               
-   Copyright 2008 (c) Qualcomm, Incorporated.  All Rights Reserved.
-=======
-
-   Copyright 2008 (c) Qualcomm Technologies, Inc.  All Rights Reserved.
->>>>>>> f7413b6... wlan: voss: remove obsolete "INTEGRATED_SOC" featurization:prima/CORE/VOSS/src/vos_api.c
-   
-   Qualcomm Confidential and Proprietary.
   
   ========================================================================*/
  /*===========================================================================