[Bf-blender-cvs] [fc348a563ec] blender2.8: Fix bad merge resolution from previous commit

[Sergey Sharybin]

Commit: fc348a563ecb515416a563b42c78a621428967f9
Author: Sergey Sharybin
Date:   Mon Mar 26 14:59:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfc348a563ecb515416a563b42c78a621428967f9

Fix bad merge resolution from previous commit

===================================================================

M	intern/ghost/test/CMakeLists.txt

===================================================================

diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index da387094619..0cec217630c 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -203,11 +203,7 @@ target_link_libraries(gears_c
 		glewmx_lib
 		string_lib
 		${OPENGL_gl_LIBRARY}
-<<<<<<< HEAD
-=======
-		${OPENGL_glu_LIBRARY}
 		${CMAKE_DL_LIBS}
->>>>>>> master
 		${PLATFORM_LINKLIBS}
 		)
 
@@ -221,11 +217,7 @@ target_link_libraries(gears_cpp
 		glewmx_lib
 		string_lib
 		${OPENGL_gl_LIBRARY}
-<<<<<<< HEAD
-=======
-		${OPENGL_glu_LIBRARY}
 		${CMAKE_DL_LIBS}
->>>>>>> master
 		${PLATFORM_LINKLIBS}
 		)