Commit 744828c3 authored by Facundo Muñoz's avatar Facundo Muñoz ®️
Browse files

fix conflict

parent 13432d82
......@@ -49,16 +49,8 @@ langDF <- data.frame(
"BoxUnitStat" = c("Statistics", "Statistiques"),
# Risk factors box
<<<<<<< HEAD
"BoxRiskRawMap" = c("Original scale", "Échelle originale"),
"BoxRiskStandRaster" = c("Risk scale", "Échelle de risque"),
||||||| merged common ancestors
"BoxRiskRawMap" = c("Raw", "Brut"),
"BoxRiskStandRaster" = c("Standardized raster", "Raster standardisé"),
=======
"BoxRiskRawMap" = c("Original scale", "Echelle originale"),
"BoxRiskStandRaster" = c("Risk scale", "Echelle de risque"),
>>>>>>> 6c334642e14d50f808958cbec9df7c5bd190a662
"ABRiskRasterInvert" = c("Invert", "Inverser"),
"RBRiskLayer" = c("Scale risk factors",
"Mise en échelle des facteurs de risque"),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment