New item (FontItem), allowing to show information about font setting and to select...

[modules/gui.git] / src / GLViewer / Makefile.in

diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in
index 1a0dd98547ae95b4a9de84badf596a573e4c2308..d921dd29453b57fb2c8bfff6c6f180c3655850ca 100644 (file)
--- 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 \