update readme

rjdverse · May 2, 2024 · f2720f8 · f2720f8
1 parent 9b93bd9
commit f2720f8
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/README.Rmd b/README.Rmd
@@ -18,12 +18,7 @@ knitr::opts_chunk$set(
 
 ## Installation
 
-<<<<<<< HEAD
 Running rjd3 packages requires **Java 17 or higher**. How to set up such a configuration in R is explained [here](https://jdemetra-new-documentation.netlify.app/#Rconfig) 
-=======
-Running rjd3 packages requires Java 17 or higher. How to set up such a configuration in R is explained [here](https://jdemetra-new-documentation.netlify.app/#installing-the-software) 
-
->>>>>>> 84901b88ece64a41fa82dfc3c5161e403081473e
 
 To get the current stable version (from the latest release):