| Chunk |
|---|
| Conflicting content |
|---|
@Inject private CurrentProjectHolder cph; <<<<<<< HEAD private Resource currentResource; ======= @Inject private PromptTypeConverter promptTypeConverter; >>>>>>> d5b3c7a3d35fe9926bfb304f5c3ef8cc2578daa7 private ConsoleReader reader; private Completer completer; |
| Solution content |
|---|
@Inject private CurrentProjectHolder cph; private Resource currentResource; @Inject private PromptTypeConverter promptTypeConverter; private ConsoleReader reader; private Completer completer; |
| File |
|---|
| ShellImpl.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Annotation |
| Attribute |