Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
*.dart text eol=lf
*.yaml text eol=lf

lib/resources/styles.css linguist-generated=true

# Don't collapse in github code reviews by default.
lib/src/version.dart linguist-generated=false
lib/src/html/resources.g.dart linguist-generated=false
Expand All @@ -9,6 +11,7 @@ lib/src/html/resources.g.dart linguist-generated=false
# At the end of a rebase or a merge, the dev may still need to regenerate
# these files with `dart run tool/task.dart build`.
lib/resources/docs.dart.js merge=theirs
lib/resources/styles.css merge=theirs
lib/resources/docs.dart.js.map merge=theirs
lib/src/generator/templates.aot_renderers_for_html.dart merge=theirs
lib/src/generator/templates.aot_renderers_for_md.dart merge=theirs
Expand Down
Loading