pvlib
diff --git a/‎.gitattributes‎
Lines changed: 1 addition & 0 deletions b/‎.gitattributes‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎pvlib/data/12839.tm2‎
Lines changed: 8761 additions & 8761 deletions b/‎pvlib/data/12839.tm2‎
Lines changed: 8761 additions & 8761 deletions
diff --git a/‎pvlib/data/sam-library-sandia-modules-2015-6-30.csv‎
Lines changed: 526 additions & 526 deletions b/‎pvlib/data/sam-library-sandia-modules-2015-6-30.csv‎
Lines changed: 526 additions & 526 deletions
diff --git a/‎pvlib/iotools/bsrn.py‎
Lines changed: 469 additions & 469 deletions b/‎pvlib/iotools/bsrn.py‎
Lines changed: 469 additions & 469 deletions
@@ -1,2 +1,3 @@
 # reduce the number of merge conflicts
 docs/sphinx/source/whatsnew/* merge=union
+* text=auto
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# reduce the number of merge conflicts`
`2`	`2`	`docs/sphinx/source/whatsnew/* merge=union`
	`3`	`+* text=auto`