Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history 
Merge branch 'devel' of github.com:SantanderMetGroup/downscaleR into devel

# Conflicts:
#	DESCRIPTION
  • Loading branch information
@jbedia
jbedia committed May 23, 2020
2 parents 3c1f441 + 8a2759e commit 67d4cbe
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 67d4cbe

Please sign in to comment.