Skip to content

Commit 105da3a

Browse files
Leonard013Leonard013
committed
Merge branch 'main' into fix/2238-sun-rise-set-local-day
2 parents 3de8c0c + 3e903d3 commit 105da3a

9 files changed

Lines changed: 12071 additions & 12069 deletions

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# ensure right line ending normalization in all contributor setups
2+
* text=auto
13
# reduce the number of merge conflicts
24
docs/sphinx/source/whatsnew/* merge=union

‎pvlib/data/12839.tm2‎

Lines changed: 8761 additions & 8761 deletions
Large diffs are not rendered by default.

‎pvlib/data/sam-library-sandia-modules-2015-6-30.csv‎

Lines changed: 526 additions & 526 deletions
Large diffs are not rendered by default.

‎pvlib/iotools/bsrn.py‎

Lines changed: 469 additions & 469 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)