Fix conflict marker

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@138 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/lib/Makefile.in b/lib/Makefile.in
index a16c306ec1c304a0225b683632a9f68e410c43c3..bbe7a035b3d34eef63bc86d88a5a7e3f9a4c0452 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -56,17 +56,10 @@ zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et
 
 check:
 
-<<<<<<< Makefile.in
-install: libzephyr.$(LIBEXT)
-       -${INSTALL} -m 644 libzephyr.a ${DESTDIR}${libdir}
-       -$(INSTALL) -m 644 libzephyr.so ${DESTDIR}$(libdir)
-
-       ${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1
-=======
 install: libzephyr.la
        ${LIBTOOL} ${INSTALL} -m 644 libzephyr.la ${DESTDIR}${libdir}
        ${LIBTOOL} ${INSTALL} -m 644 ${srcdir}/zephyr.1 ${DESTDIR}${mandir}/man1
->>>>>>> 1.1.1.2
+
 
 clean:
        ${LIBTOOL} rm -f ${OBJS} libzephyr.la zephyr_err.c zephyr_err.h