| Chunk |
|---|
| Conflicting content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.TextEditingTargetRMarkdownHelper; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionManager; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionRequest; <<<<<<< HEAD import org.rstudio.studio.client.workbench.views.source.editors.text.r.RCompletionToolTip; import org.rstudio.studio.client.workbench.views.source.model.CppCompletion; ======= import org.rstudio.studio.client.workbench.views.source.editors.text.r.SignatureToolTipManager; >>>>>>> 57b2ab89ca67e7171ff691d4984a486068b76f1b import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook; |
| Solution content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.TextEditingTargetRMarkdownHelper; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionManager; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionRequest; import org.rstudio.studio.client.workbench.views.source.editors.text.r.RCompletionToolTip; import org.rstudio.studio.client.workbench.views.source.model.CppCompletion; import org.rstudio.studio.client.workbench.views.source.editors.text.r.SignatureToolTipManager; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook; |
| File |
|---|
| RStudioGinjector.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |