File tree Expand file tree Collapse file tree 1 file changed +10
-0
lines changed Expand file tree Collapse file tree 1 file changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -18,8 +18,13 @@ source(file.path(projroot,'source/R/vertalingen.R'))
18
18
conflicted :: conflicts_prefer(dplyr :: filter )
19
19
20
20
update_fiche_data <- TRUE
21
+ <<<<<<< HEAD
21
22
update_habitatkwaliteit_data <- FALSE
22
23
update_data_opp <- FALSE
24
+ =======
25
+ update_habitatkwaliteit_data <- TRUE
26
+ update_data_opp <- TRUE
27
+ >>>>>>> 22d38f1498d609d4ff4dcc87f60363303a69197b
23
28
24
29
# #####################################
25
30
# # Indien alle data al gegenereerd is
@@ -382,10 +387,15 @@ if (update_habitatkwaliteit_data) {
382
387
# "Ruimtelijke samenhang (niveau VL)")) %>%
383
388
# mutate(Toestand = ifelse(is.na(Toestand), "n.v.t.", Toestand))
384
389
#
390
+ <<<<<<< HEAD
385
391
#
386
392
}
387
393
388
394
if (update_data_opp ) {
395
+ =======
396
+ }
397
+ if (update_data_opp ){
398
+ >>>>>>> 22d38f1498d609d4ff4dcc87f60363303a69197b
389
399
# ------------------data oppervlaktes voor bar charts---------------------------#
390
400
# ------------------------------2025--------------------------------------------#
391
401
google_id_opp <- " 18tmnZ8Ze1K1fx9Yykn3JQ6d25eLgaVxPbim7L6-dLNo"
You can’t perform that action at this time.
0 commit comments