Skip to content
Snippets Groups Projects
Commit a6dd26c7 authored by Ben Anderson's avatar Ben Anderson
Browse files

fixed merge 

Merge branch 'master' of git.soton.ac.uk:ba1e12/spatialec

# Conflicts:
#	greenGridr/README.md
parents d9af1134 e965c561
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
greenGridr/README.md
+ 1
− 1
View file @ a6dd26c7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Package of functions to process [NZ GreenGrid](https://www.otago.ac.nz/centre-sustainability/research/energy/otago050285.html) data. Package of functions to process [NZ GreenGrid](https://www.otago.ac.nz/centre-sustainability/research/energy/otago050285.html) data.
See package [DESCRIPTION](DESCRIPTION) file for (not a lot) more info. See package [DESCRIPTION](DESCRIPTION) file for (some) more info.
### Terms of code re-use ### Terms of code re-use
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment