Projects >> xtext >>e64de19c4a7accce10c5cb2fb226376a0e100539

Chunk
Conflicting content
				addFragment(new GrammarAccessFragment2());
				addFragment(new FragmentAdapter(new SerializerFragment()));
				addFragment(new Formatter2Fragment2());
<<<<<<< HEAD
				addFragment(new FragmentAdapter(new JavaBasedContentAssistFragment()));
				XtextAntlrGeneratorFragment2 antlr = new XtextAntlrGeneratorFragment2();
=======
				addFragment(new ContentAssistFragment2());
				XtextAntlrGeneratorFragment antlr = new XtextAntlrGeneratorFragment();
>>>>>>> 89cd592066295f073f1ca2b95261f349267b62eb
				antlr.setOptions(antlrOptions);
				addFragment(antlr);
			}});
Solution content
				addFragment(new GrammarAccessFragment2());
				addFragment(new FragmentAdapter(new SerializerFragment()));
				addFragment(new Formatter2Fragment2());
				XtextAntlrGeneratorFragment2 antlr = new XtextAntlrGeneratorFragment2();
				addFragment(new ContentAssistFragment2());
				antlr.setOptions(antlrOptions);
				addFragment(antlr);
			}});
File
GenerateXbase.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable