Skip to content
Snippets Groups Projects

fixed a merge

Merged fixed a merge
ba1e12/fridayFagPackets:master into master
Merged Ben Anderson requested to merge ba1e12/fridayFagPackets:master into master
Viewing commit 41c7e8dc
Prev
Show latest version
1 file
+ 1
− 1
Compare changes
  • Side-by-side
  • Inline
  • 41c7e8dc
    Ben Anderson
    attempted to fix merge · 41c7e8dc
    Ben Anderson authored 
    Merge branch 'master' of git.soton.ac.uk:ba1e12/fridayFagPackets
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
gdpAndEmissions/GDP_emissions_trends.qmd
+ 1
− 1
@@ -47,7 +47,7 @@ Downloaded from the awesome [OurWorldInData](https://ourworldindata.org/grapher/
@@ -47,7 +47,7 @@ Downloaded from the awesome [OurWorldInData](https://ourworldindata.org/grapher/
```{r}
```{r}
#| label: loasdData
#| label: loasdData
# fix
dt_abs <- data.table::fread(here::here("data", "co2-emissions-and-gdp.csv"))
dt_abs <- data.table::fread(here::here("data", "co2-emissions-and-gdp.csv"))
dt_pc <- data.table::fread(here::here("data", "co2-emissions-and-gdp-per-capita.csv"))
dt_pc <- data.table::fread(here::here("data", "co2-emissions-and-gdp-per-capita.csv"))