Skip to content

Commit d0ec3ac

Browse files
authored
Merge pull request #3 from nginx/update-gitattributes
Update .gitattributes fix previous error in #2
2 parents 8a2f41f + 0c6cd67 commit d0ec3ac

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

.gitattributes

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Set the default behavior for correcting line endings,
22
# in case people don't have core.autocrlf set.
33
* text=auto
4-
F5-NGINX-team-notes.md merge=ours
5-
README.md merge=ours
6-
LICENSE merge=ours
7-
CONTRIBUTING_DOCS.md merge=ours
8-
CONTRIBUTING.md merge=ours
9-
.github/pull_request_template.md merge=ours
4+
.github/workflows/update_from_nginx_documentation.yml merge=ours
105
.gitattributes merge=ours

0 commit comments

Comments
 (0)