Update programs-required-version.txt

mokymai · May 27, 2024 · 5da606a · 5da606a
1 parent 20bd5bc
commit 5da606a
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/inst/install-r/programs-required-version.txt b/inst/install-r/programs-required-version.txt
@@ -1,10 +1,6 @@
 ---
 title: "Minimal required versions of programs"
-<<<<<<< HEAD
 date:  2024-05-27
-=======
-date:  2024-02-08
->>>>>>> master
 notes: ""
 
 
@@ -13,13 +9,8 @@ notes: ""
 ---
 # This text must be in line 10 -----------------------------------------------
 program                     | required_version | ignore | notes_version
-<<<<<<< HEAD
 R                           | 4.3.3            | FALSE  |
 RStudio                     | 2023.12.1        | FALSE  | For 32-bit systems v 1.1.463
 Quarto                      | 1.4.554          | FALSE  |
-=======
-R                           | 4.3.2            | FALSE  |
-RStudio                     | 2023.12.1        | FALSE  | For 32-bit systems v 1.1.463
-Quarto                      | 1.4.549          | FALSE  |
->>>>>>> master
+