From: smh <smh@opencascade.com>
Date: Mon, 27 Jun 2005 05:38:01 +0000 (+0000)
Subject: SMH: Fix misprint
X-Git-Tag: T3_0_0_a4~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0c4a8dd006990a89b8de8be68d8862fc70b61347;p=modules%2Fgui.git

SMH: Fix misprint
---

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 \