DESCRIPTION

Fix missing decoration for conflicting files

Change I0d63413c644b4dcfe9aaa6052e397673feaae6fb (Queue decoration
requests) introduced a problem related to conflicting files - they
were not decorated properly, but exceptions were written to the
Eclipse log.

Change-Id: I71713ec3389ac6acea23ad1a46957d8be930f53c
Signed-off-by: Reed Meza xxx@xxx.xxx

COMMENTS

author: Willow Cantrell
date: 2011-02-04 10:33:14.000000000

Patch Set 1:

Matthias, can we check this in or do we need a new change from a committer?

-------------------------------------
author: Willow Cantrell
date: 2011-02-04 11:50:50.000000000

Patch Set 1: Looks good to me, approved; Build Successful; IP review completed



-------------------------------------
author: Willow Cantrell
date: 2011-02-04 11:50:53.000000000

Change has been successfully merged into the git repository.

-------------------------------------
