Skip to content

Commit a2d0169

Browse files
Merge branch '5.0' into 5.1
2 parents ee0a95d + a9fe397 commit a2d0169

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.gitattributes

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
/build export-ignore
1+
/build* export-ignore
2+
/*.md export-ignore
3+
/LICENSE export-ignore
4+
/*.xml export-ignore
5+
/*.xsd export-ignore
6+
/tests export-ignore
7+
/.gitattributes export-ignore
8+
/.gitignore export-ignore
9+
/.php_cs export-ignore
10+
/.travis.yml export-ignore
11+
212
*.php diff=php
3-
composer.json merge=ours
4-
src/Runner/Version.php merge=ours
13+

0 commit comments

Comments
 (0)