X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGLViewer%2FMakefile.in;h=d921dd29453b57fb2c8bfff6c6f180c3655850ca;hb=3b3dce973acb7299499dd3527ded627940516ab3;hp=1a0dd98547ae95b4a9de84badf596a573e4c2308;hpb=4b914be3971471bcd67878b96fbdca12fbc2ac1d;p=modules%2Fgui.git

diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in
index 1a0dd9854..d921dd294 100644
--- a/src/GLViewer/Makefile.in
+++ b/src/GLViewer/Makefile.in
@@ -46,16 +46,12 @@ PO_FILES = GLViewer_images.po \
 # Libraries targets
 LIB = libGLViewer.la
 
-<<<<<<< Makefile.in
 LIB_SRC= GLViewer_AspectLine.cxx \
 	 GLViewer_BaseDrawers.cxx \
 	 GLViewer_BaseObjects.cxx \
 	 GLViewer_Compass.cxx \
 	 GLViewer_Context.cxx \
 	 GLViewer_CoordSystem.cxx \
-=======
-LIB_SRC= GLViewer_Context.cxx \
->>>>>>> 1.3
 	 GLViewer_Drawer.cxx \
 	 GLViewer_Geom.cxx \
 	 GLViewer_Grid.cxx \