refix

2015-02-17 23:37:56 +01:00
parent fe4f73920b
commit 1cfa810edb
2 changed files with 1 additions and 11 deletions
--- a/R-package/vignettes/vignette.css
+++ b/R-package/vignettes/vignette.css
@@ -137,22 +137,15 @@ 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;        
 }