Fixed merge errors.

[dense-linear-algebra-libraries/linalg.git] / readme.txt

diff --git a/readme.txt b/readme.txt
index 51ea24e5bef621522ab545d7d47df3b5d731484e..234d5198e05c9af47448a576ae0df56eb59c2432 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -2,11 +2,7 @@ Build instructions of LINALG component:
 
 1.--------- Set environment variables ---------
 
-<<<<<<< HEAD
 Following environment variables must be set in order to build DSP-only LINALG (version numbers are used as examples):
-=======
-Following environment vaialbes must be set in order to build DSP-only LINALG (version numbers are used as examples):
->>>>>>> 299debba568f6179b3bdbaf0a1242579dd466cf7
 
 export CGTROOT="<TI_CGT_INSTALLATION_ROOT>/cgt-c6x"
 export PDK_DIR="<COMPONENTS_INSTALLATION_ROOT>/pdk_c667x_2_0_1"