Projects >> astrid >>09c945ae52369fb6814fd9aecfbfcf881c2d6dcb

Chunk
Conflicting content 
                new QueryTemplate().where(
                        Criterion.and(TaskCriteria.activeVisibleMine(),
                                Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(
<<<<<<< HEAD
                                        Criterion.and(MetadataCriteria.withKey(TagMetadata.KEY),
                                                TagMetadata.TAG_NAME.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$
                null);
=======
                                        Criterion.and(MetadataCriteria.withKey(TagService.KEY),
                                                TagService.TAG.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$
                                                null);
>>>>>>> 7b25595150f80e2aae894b7371c3c539a2e86e80
        int themeFlags = ThemeService.getFilterThemeFlags();
        inbox.listingIcon = ((BitmapDrawable)r.getDrawable(
                ThemeService.getDrawable(R.drawable.filter_inbox, themeFlags))).getBitmap();
Solution content 
                new QueryTemplate().where(
                        Criterion.and(TaskCriteria.activeVisibleMine(),
                                Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(
                                        Criterion.and(MetadataCriteria.withKey(TagMetadata.KEY),
                                                TagMetadata.TAG_NAME.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$
                                                null);
        int themeFlags = ThemeService.getFilterThemeFlags();
        inbox.listingIcon = ((BitmapDrawable)r.getDrawable(
                ThemeService.getDrawable(R.drawable.filter_inbox, themeFlags))).getBitmap();
File
CoreFilterExposer.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
public final class UpgradeService {

<<<<<<< HEAD
    public static final int V4_5_0 = 300;
=======
    public static final int V4_4_3 = 288;
>>>>>>> 7b25595150f80e2aae894b7371c3c539a2e86e80
    public static final int V4_4_2 = 287;
    public static final int V4_4_1 = 286;
    public static final int V4_4 = 285;
Solution content 
public final class UpgradeService {

    public static final int V4_5_0 = 300;
    public static final int V4_4_3 = 288;
    public static final int V4_4_2 = 287;
    public static final int V4_4_1 = 286;
    public static final int V4_4 = 285;
File
UpgradeService.java
Developer's decision
Concatenation
Kind of conflict
Attribute