Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	R-package/vignettes/discoverYourData.Rmd
	R-package/vignettes/vignette.css
This commit is contained in:
El Potaeto
2015-02-17 23:35:52 +01:00
parent 412a6e1085 2e391ed0ee
commit fe4f73920b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
R-package/vignettes/vignette.css
View File

@@ -126,7 +126,7 @@ pre {
}
code {
font-family: Consolas, Monaco, Andale Mono, monospace;
font-family: Consolas, Monaco, Andale Mono, monospace, courrier new;
line-height: 1.5;
font-size: 15px;
background: #F8F8F8;
@@ -137,14 +137,22 @@ code {
white-space: pre-wrap;
}
<<<<<<< HEAD
p code {
=======
blockquote code {
>>>>>>> origin/master
background: #CDCDCD;
color: #606AAA;
}
code.r, code.cpp {
display: block;
<<<<<<< HEAD
word-wrap: break-word;
=======
word-wrap: break-word;
>>>>>>> origin/master
border: 1px solid #606AAA;
}