fix git conficts

Author: kvantas

DESCRIPTION

@@ -25,21 +25,8 @@ License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.3.2
-<<<<<<< HEAD
-Imports: stringi (>= 1.5),
-    stringr (>= 1.4), 
-    tibble(>= 3.1),
-    pingr (>= 2.0),
-    readr (>= 1.4),
-    jsonlite (>= 1.7)
-Suggests: 
-    ggplot2 (>= 3.3),
-    knitr (>= 1.31),
-    rmarkdown (>= 2.7),
-    httptest,
-    testthat (>= 3.0)
-=======
 Imports: stringi (>= 1.8),
+    pingr (>= 2.0),
     stringr (>= 1.5), 
     tibble(>= 3.2),
     readr (>= 2.1),
@@ -48,6 +35,6 @@ Suggests:
     ggplot2 (>= 3.5),
     knitr (>= 1.45),
     rmarkdown (>= 2.25),
+    httptest,
     testthat (>= 3.2)
->>>>>>> 5f92c0e554c5e22aa235c2fc0bec391976bb65f4
 VignetteBuilder: knitr

R/enhydris_api.R

@@ -86,7 +86,7 @@ enhydris_get <- function(subdomain = c("kyy", "ypaat", "emy", "deh"),
   subdomain <- match.arg(subdomain)
 
   # check if server is alive
-  server_alive(subdomain)
+  # server_alive(subdomain)
 
   # create hydroscope url
   api <- enhydris_names(api_value)

R/utils.R

@@ -11,9 +11,8 @@ server_alive <- function(subdomain) {
   err_msg <- paste(
     "The server for that data source is probably down,",
     "get more info at [email protected] or try",
-    "again later."
-  )
-<<<<<<< HEAD
+    "again later.")
+
   tryCatch({
     if (all(is.na(pingr::ping_port(server_address(subdomain),
       port = 80L,
@@ -24,13 +23,11 @@ server_alive <- function(subdomain) {
   },
   error = function(e) {
     # The original error message is now the default stop message
-    stop(err_msg, call. = FALSE)
-=======
+    stop(err_msg, call. = FALSE)})
 
   # test the http capabilities of the current R build
   if (!capabilities(what = "http/ftp")) {
     stop("The current R build has no http capabilities")
->>>>>>> 5f92c0e554c5e22aa235c2fc0bec391976bb65f4
   }
 
   # test connection by trying to read first line of url

README.Rmd

@@ -32,15 +32,9 @@ online <- function(url = "kyy.hydroscope.gr") {
 chk_online   <- online()
 
 ```
-<<<<<<< HEAD
- 
-[![Travis-CI Build Status](https://app.travis-ci.com/ropensci/hydroscoper.svg?branch=master)](https://app.travis-ci.com/ropensci/hydroscoper)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/ropensci/hydroscoper?branch=master&svg=true)](https://ci.appveyor.com/project/ropensci/hydroscoper)
-[![codecov](https://app.codecov.io/gh/ropensci/hydroscoper/branch/master/graph/badge.svg)](https://app.codecov.io/gh/ropensci/hydroscoper) 
-=======
+
 [![tic](https://github.com/ropensci/hydroscoper/workflows/tic/badge.svg?branch=master)](https://github.com/ropensci/hydroscoper/actions)
 [![codecov](https://codecov.io/github/ropensci/hydroscoper/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/ropensci/hydroscoper) 
->>>>>>> 5f92c0e554c5e22aa235c2fc0bec391976bb65f4
 [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.4-6666ff.svg)](https://cran.r-project.org/)
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/hydroscoper)](https://cran.r-project.org/package=hydroscoper)
 [![packageversion](https://img.shields.io/badge/Package%20version-1.7.0-orange.svg?style=flat-square)](https://github.com/ropensci/hydroscoper)

README.md

@@ -3,16 +3,8 @@ hydroscoper
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
-<<<<<<< HEAD
-[![Travis-CI Build
-Status](https://app.travis-ci.com/ropensci/hydroscoper.svg?branch=master)](https://app.travis-ci.com/ropensci/hydroscoper)
-[![AppVeyor Build
-Status](https://ci.appveyor.com/api/projects/status/github/ropensci/hydroscoper?branch=master&svg=true)](https://ci.appveyor.com/project/ropensci/hydroscoper)
-[![codecov](https://app.codecov.io/gh/ropensci/hydroscoper/branch/master/graph/badge.svg)](https://app.codecov.io/gh/ropensci/hydroscoper)
-=======
 [![tic](https://github.com/ropensci/hydroscoper/workflows/tic/badge.svg?branch=master)](https://github.com/ropensci/hydroscoper/actions)
 [![codecov](https://codecov.io/github/ropensci/hydroscoper/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/ropensci/hydroscoper)
->>>>>>> 5f92c0e554c5e22aa235c2fc0bec391976bb65f4
 [![minimal R
 version](https://img.shields.io/badge/R%3E%3D-3.4-6666ff.svg)](https://cran.r-project.org/)
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/hydroscoper)](https://cran.r-project.org/package=hydroscoper)
@@ -83,23 +75,6 @@ library(ggplot2)
 
 ts_raw <- get_data(subdomain = "kyy", time_id = 56)
 ts_raw
-<<<<<<< HEAD
-#> # A tibble: 147,519 × 3
-#>    date                value comment
-#>    <dttm>              <dbl> <chr>  
-#>  1 1985-05-06 08:00:00     0 1      
-#>  2 1985-05-06 08:30:00     0 1      
-#>  3 1985-05-06 09:00:00     0 1      
-#>  4 1985-05-06 09:30:00     0 1      
-#>  5 1985-05-06 10:00:00     0 1      
-#>  6 1985-05-06 10:30:00     0 1      
-#>  7 1985-05-06 11:00:00     0 1      
-#>  8 1985-05-06 11:30:00     0 1      
-#>  9 1985-05-06 12:00:00     0 1      
-#> 10 1985-05-06 12:30:00     0 1      
-#> # ℹ 147,509 more rows
-=======
->>>>>>> 5f92c0e554c5e22aa235c2fc0bec391976bb65f4
 ```
 
 Let’s create a plot: