Skip to content

Commit

Permalink
fix conflict in README
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/BigelowLab/thredds

# Conflicts:
#	README.md
  • Loading branch information
eblondel committed Feb 14, 2022
2 parents c824fea + 093b6a9 commit 7d294b2
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

[![Build Status](https://github.com/BigelowLab/thredds/actions/workflows/r-cmd-check.yml/badge.svg?branch=master)](https://github.com/BigelowLab/thredds/actions/workflows/r-cmd-check.yml)
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/thredds)](https://cran.r-project.org/package=thredds)
[![cran checks](https://cranchecks.info/badges/worst/thredds)](https://cran.r-project.org/web/checks/check_results_thredds.html)
[![Github_Status_Badge](https://img.shields.io/badge/Github-0.1--1-blue.svg)](https://github.com/BigelowLab/thredds)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.6027224.svg)](https://doi.org/10.5281/zenodo.6027224)

[THREDDS](https://www.unidata.ucar.edu/software/thredds/current/tds/TDS.html) catalogs
are well described. This package provides only client-side functionality where the user provides
Expand Down

0 comments on commit 7d294b2

Please sign in to comment.