Projects >> qcadoo >>60fba2088776b17aea2c51f302a18417bd4bfbe1

Chunk
Conflicting content 
 */
package com.qcadoo.view.internal.components.grid;

<<<<<<< HEAD
import java.util.*;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
=======
>>>>>>> 2d81bf813984df810fa7572933f924ce8bccc384
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
Solution content 
 */
package com.qcadoo.view.internal.components.grid;

import com.google.common.base.Function;
import com.google.common.base.Predicate; 
import com.google.common.base.Predicates;
File
GridComponentPattern.java
Developer's decision
Version 2
Kind of conflict
Import