ayatana-commits team mailing list archive

["Neil J. Patel" <neil.patel@xxxxxxxxxxxxx>]

Review: Needs Fixing
8	+<<<<<<< TREE
9	libdbusmenu-[0-9].[0-9].[0-9].tar.gz
10	libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
11	+=======
12	+tools/dbusmenu-dumper
13	+>>>>>>> MERGE-SOURCE

Looks like a conflict, otherwise everything else looks good.
-- 
https://code.edge.launchpad.net/~ted/dbusmenu/dump-tool/+merge/12899
Your team ayatana-commits is subscribed to branch lp:dbusmenu.