From ae2b93a6f78a987062a96a34907be3b343436577 Mon Sep 17 00:00:00 2001 From: Perberos Date: Tue, 15 Nov 2011 18:23:47 -0300 Subject: fixing file conflicts on stickynotes applet --- stickynotes/pixmaps/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stickynotes/pixmaps') diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am index 95634b58..837ecbb8 100644 --- a/stickynotes/pixmaps/Makefile.am +++ b/stickynotes/pixmaps/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/stickynotes +stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/mate-stickynotes stickynotes_applet_pixmaps_DATA = \ locked.png \ unlocked.png \ -- cgit v1.2.1