Projects >> errai >>09bf2226bc672af9008ea3055160e3755bef1bff

Chunk
Conflicting content
  private boolean isStatic;
  private boolean isInner;

<<<<<<< HEAD
  private BlockStatement staticInitializer = new BlockStatement();  
=======
  private BlockStatement staticInitializer = new BlockStatement();
  private BlockStatement instanceInitializer = new BlockStatement();

>>>>>>> 5a7fb664024fe07ff5680929b8feb9e2a0d55c05
  private List annotations = new ArrayList();
  private List innerClasses = new ArrayList();
  private List methods = new ArrayList();
Solution content
  private boolean isStatic;
  private boolean isInner;

  private BlockStatement staticInitializer = new BlockStatement();
  private BlockStatement instanceInitializer = new BlockStatement();

  private List annotations = new ArrayList();
  private List innerClasses = new ArrayList();
  private List methods = new ArrayList();
File
BuildMetaClass.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation