Skip to content

Commit

Permalink
Merge branch 'ankidroid:main' into DeckPicker
Browse files Browse the repository at this point in the history
  • Loading branch information
xenonnn4w committed Jul 30, 2024
2 parents 6bf188a + 76eea74 commit 8f16b63
Show file tree
Hide file tree
Showing 40 changed files with 1,045 additions and 654 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[*]
end_of_line = lf

[*.bat]
end_of_line = crlf
50 changes: 47 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,52 @@
*.bat text
*.csv text
# For each file not matching a pattern listed below, let git automatically
# detect whether it's a text file. If it is, use LF end of lines.
# Last match resolves, so we place the catch-all at the top of the file.
* text=auto eol=lf

# Text file whose eol is not specified defaults to LF. We only need to
# explicitly specify when we want CRLF.
*.awk text
*.bat text eol=crlf
*.css text
*.csv text
*.gradle text
*.html text
*.java text
*.js text
*.json text
*.kt text
*.kts text
*.md text
*.py text
*.sh text
*.sql text
*.toml text
*.ts text
*.txt text
*.xml text
.idea/dictionaries/*.xml linguist-generated=false
*.yaml text
*.yml text

# Files we want to diff, but not change the line endings.
*.anki2 -text
*.crt -text
*.svg -text

# Binary and compiled files. We want to neither diff nor alter these files.
*.apkg binary
*.gz binary
*.jar binary
*.mp4 binary
*.mwb binary
*.png binary
*.psd binary
*.tgz binary
*.ttf binary
*.webm binary
*.woff binary
*.xcf binary
*.zip binary

# Tell GitHub that this file is not auto-generated, and should be displayed
# in diffs.
.idea/dictionaries/*.xml linguist-generated=false
Loading

0 comments on commit 8f16b63

Please sign in to comment.