Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# reduce the number of merge conflicts
docs/sphinx/source/whatsnew/* merge=union
* text=auto
Comment thread
Aditya-myst marked this conversation as resolved.
Outdated
17,522 changes: 8,761 additions & 8,761 deletions pvlib/data/12839.tm2

Large diffs are not rendered by default.

1,052 changes: 526 additions & 526 deletions pvlib/data/sam-library-sandia-modules-2015-6-30.csv

Large diffs are not rendered by default.

938 changes: 469 additions & 469 deletions pvlib/iotools/bsrn.py

Large diffs are not rendered by default.

Loading
Loading