Projects >> rstudio >>13a9ce696e8c527892db726bcd2d348f90b5e6fe

Chunk
Conflicting content 
      rMarkdownLabel.getElement().getStyle().setPaddingTop(14, Unit.PX);
      displayPanel.add(rMarkdownLabel);
      displayPanel.add(checkboxPref("Show inline toolbar for R code chunks", prefs_.showInlineToolbarForRCodeChunks()));
<<<<<<< HEAD
      displayPanel.add(checkboxPref("Show R chunk execution output within editor", prefs_.showRmdChunkOutputInline()));
      displayPanel.add(checkboxPref("Show document outline by default", prefs_.showDocumentOutlineRmd()));
=======
>>>>>>> 398d65776dcf29693a9b2614790ba94972f43e0c
      displayPanel.add(checkboxPref("Show unnamed entries in document outline", prefs_.showUnnamedEntriesInDocumentOutline()));
      rmdViewerMode_ = new SelectWidget(
            "Show output preview in: ",
Solution content 
      rMarkdownLabel.getElement().getStyle().setPaddingTop(14, Unit.PX);
      displayPanel.add(rMarkdownLabel);
      displayPanel.add(checkboxPref("Show inline toolbar for R code chunks", prefs_.showInlineToolbarForRCodeChunks()));
      displayPanel.add(checkboxPref("Show R chunk execution output within editor", prefs_.showRmdChunkOutputInline()));
      displayPanel.add(checkboxPref("Show unnamed entries in document outline", prefs_.showUnnamedEntriesInDocumentOutline()));
      rmdViewerMode_ = new SelectWidget(
            "Show output preview in: ",
File
EditingPreferencesPane.java
Developer's decision
Combination
Kind of conflict
Method invocation