[concordance-commit] concordance/libconcord Makefile.am,1.14,1.15

[Phil D. <ja...@us...>]

Update of /cvsroot/concordance/concordance/libconcord
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22276/libconcord

Modified Files:
	Makefile.am 
Log Message:
mergehell: one more merge conflict from zwave merge

Index: Makefile.am
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	10 Apr 2013 04:20:57 -0000	1.14
+++ Makefile.am	10 Apr 2013 04:27:07 -0000	1.15
@@ -23,11 +23,6 @@
 install_udev_common:
 	$(MKDIR_P) $(DESTDIR)$(UDEVLIBDIR)/udev/rules.d
 	$(install_sh_DATA) libconcord.rules \
-<<<<<<< Makefile.am
-		$(DESTDIR)$(sysconfdir)/udev/rules.d/60-libconcord.rules
-
-install_udev: udev install_udev_generic
-=======
 		$(DESTDIR)$(UDEVLIBDIR)/udev/rules.d/60-libconcord.rules
 	$(install_sh_DATA) libconcord-usbnet.rules \
 		$(DESTDIR)$(UDEVLIBDIR)/udev/rules.d/80-libconcord-usbnet.rules
@@ -39,7 +34,6 @@
 install_udev: udev install_udev_common
 install_old_udev: old_udev install_udev_common
 install_generic_udev: generic_udev install_udev_common
->>>>>>> 1.11.2.9
 
 old-udev:
 	./gen_udev_support -o