fix merge

Author: njahn82

README.md

@@ -253,6 +253,7 @@ oa_df <- roadoi::oadoi_fetch(random_dois,
 
 #### Analysis
 
+<<<<<<< HEAD
 roadoi returns the data in a consistent structure improved for further analysis in R. 
 
 
@@ -262,14 +263,14 @@ oa_df
 #>    doi   best_oa_location oa_locations oa_locations_em… data_standard is_oa
 #>    <chr> <list>           <list>       <list>                   <int> <lgl>
 #>  1 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
-#>  2 10.3… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
-#>  3 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
-#>  4 10.1… <tibble [1 × 11… <tibble [1 … <tibble [0 × 0]>             2 TRUE 
+#>  2 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
+#>  3 10.1… <tibble [1 × 9]> <tibble [2 … <tibble [0 × 0]>             2 TRUE 
+#>  4 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
 #>  5 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
 #>  6 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
 #>  7 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
-#>  8 10.1… <tibble [1 × 10… <tibble [2 … <tibble [0 × 0]>             2 TRUE 
-#>  9 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
+#>  8 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
+#>  9 10.3… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
 #> 10 10.1… <tibble [0 × 0]> <tibble [0 … <tibble [0 × 0]>             2 FALSE
 #> # … with 40 more rows, and 15 more variables: is_paratext <lgl>, genre <chr>,
 #> #   oa_status <chr>, has_repository_copy <lgl>, journal_is_oa <lgl>,
@@ -282,16 +283,23 @@ For example, to determine how many full-text links were found and which sources
 
 
 ```r
+=======
+roadoi returns the data in a consistent structure improved for further analysis in R. For example, to determine how many full-text links were found and which sources were used:
+#> Error: <text>:1:1: Unerwartete(s) '=='
+#> 1: ==
+#>     ^
+```
+
+```r
+>>>>>>> 70e7915333d1bc2b210427025ce2d0709f7fd739
 oa_df %>%
   group_by(is_oa) %>%
   summarise(Articles = n()) %>%
   mutate(Proportion = Articles / sum(Articles)) %>%
   arrange(desc(Articles))
-#> # A tibble: 2 x 3
-#>   is_oa Articles Proportion
-#>   <lgl>    <int>      <dbl>
-#> 1 FALSE       37       0.74
-#> 2 TRUE        13       0.26
+#> Error: <text>:1:1: Unerwartete(s) '>'
+#> 1: >
+#>     ^
 ```
 
 How did Unpaywall find those Open Access full-texts, which were characterized as best matches, and how are these OA types distributed over publication types?
@@ -306,18 +314,18 @@ oa_df %>%
   summarise(Articles = n()) %>%
   arrange(desc(Articles))
 #> # A tibble: 9 x 4
-#> # Groups:   oa_status, evidence [7]
-#>   oa_status evidence                                       genre        Articles
-#>   <chr>     <chr>                                          <chr>           <int>
-#> 1 green     oa repository (via OAI-PMH doi match)          journal-art…        3
-#> 2 bronze    open (via free pdf)                            journal-art…        2
-#> 3 gold      open (via page says license)                   journal-art…        2
-#> 4 gold      oa journal (via doaj)                          journal-art…        1
-#> 5 gold      oa journal (via publisher name)                component           1
-#> 6 gold      open (via free pdf)                            journal-art…        1
-#> 7 green     oa repository (via OAI-PMH doi match)          report              1
-#> 8 green     oa repository (via OAI-PMH title and first au… journal-art…        1
-#> 9 green     oa repository (via OAI-PMH title and first au… other               1
+#> # Groups:   oa_status, evidence [9]
+#>   oa_status evidence                                genre           Articles
+#>   <chr>     <chr>                                   <chr>              <int>
+#> 1 gold      open (via page says license)            journal-article        4
+#> 2 bronze    open (via free pdf)                     journal-article        2
+#> 3 green     oa repository (via OAI-PMH doi match)   journal-article        2
+#> 4 hybrid    open (via crossref license)             journal-article        2
+#> 5 gold      oa journal (via observed oa rate)       journal-article        1
+#> 6 gold      oa journal (via publisher name)         component              1
+#> 7 gold      open (via free pdf)                     journal-article        1
+#> 8 green     oa repository (semantic scholar lookup) book                   1
+#> 9 hybrid    open (via page says license)            journal-article        1
 ```
 
 #### More examples

vignettes/intro.Rmd

@@ -152,6 +152,7 @@ oa_df <- roadoi::oadoi_fetch(random_dois,
 
 #### Analysis
 
+<<<<<<< HEAD
 roadoi returns the data in a consistent structure improved for further analysis in R. 
 
 ```{r}
@@ -161,6 +162,11 @@ oa_df
 For example, to determine how many full-text links were found and which sources were used:
 
 ```{r}
+=======
+roadoi returns the data in a consistent structure improved for further analysis in R. For example, to determine how many full-text links were found and which sources were used:
+
+```{r}
+>>>>>>> 70e7915333d1bc2b210427025ce2d0709f7fd739
 oa_df %>%
   group_by(is_oa) %>%
   summarise(Articles = n()) %>%