-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/Xlinka/Project-Obsidian
- Loading branch information
Showing
6 changed files
with
229 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [*] | ||
| indent_style = space | ||
|
|
||
| [*.{cs,csx,vb,vbx}] | ||
| indent_size = 4 | ||
|
|
||
| [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] | ||
| indent_size = 2 | ||
|
|
||
| [*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] | ||
| indent_size = 2 | ||
|
|
||
| [*.{cs,vb}] | ||
| # Sort using and Import directives with System.* appearing first | ||
| dotnet_sort_system_directives_first = true | ||
| dotnet_style_require_accessibility_modifiers = always:warning |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #Ignores big formatting commits when checking blame. | ||
| #To make use of this file by default, run 'git config blame.ignoreRevsFile .git-blame-ignore-revs' in the project folder | ||
|
|
||
| ## Line ending conversions | ||
| c7009d2a57bd271c5bdcece21c3c290d18101b2a | ||
|
|
||
| ## .editorconfig formatting | ||
| 07f8c32a7431c30b8eecf79d6a7df19506170903 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,146 @@ | ||
| # Common settings that generally should always be used with your language specific settings | ||
|
|
||
| # Auto detect text files and perform LF normalization | ||
| * text=auto | ||
| * text=auto | ||
|
|
||
| # | ||
| # The above will handle all files NOT found below | ||
| # | ||
|
|
||
| # Documents | ||
| *.adoc text | ||
| *.bibtex text diff=bibtex | ||
| *.csv text | ||
| *.doc diff=astextplain | ||
| *.DOC diff=astextplain | ||
| *.docx diff=astextplain | ||
| *.DOCX diff=astextplain | ||
| *.dot diff=astextplain | ||
| *.DOT diff=astextplain | ||
| *.epub diff=astextplain | ||
| *.md text diff=markdown | ||
| *.mdx text diff=markdown | ||
| *.mustache text | ||
| *.pdf diff=astextplain | ||
| *.PDF diff=astextplain | ||
| *.rtf diff=astextplain | ||
| *.RTF diff=astextplain | ||
| *.sql text | ||
| *.tab text | ||
| *.tex text diff=tex | ||
| *.textile text | ||
| *.tsv text | ||
| *.txt text | ||
|
|
||
| # Graphics | ||
| *.eps binary | ||
| *.gif binary | ||
| *.ico binary | ||
| *.jpeg binary | ||
| *.jpg binary | ||
| *.png binary | ||
| # SVG treated as text by default. | ||
| *.svg text | ||
| # If you want to treat it as binary, | ||
| # use the following line instead. | ||
| # *.svg binary | ||
| *.tif binary | ||
| *.tiff binary | ||
|
|
||
| # Scripts | ||
| *.bash text eol=lf | ||
| *.fish text eol=lf | ||
| *.sh text eol=lf | ||
| *.zsh text eol=lf | ||
| # These are explicitly windows files and should use crlf | ||
| *.bat text eol=crlf | ||
| *.cmd text eol=crlf | ||
| *.ps1 text eol=crlf | ||
|
|
||
| # Serialisation | ||
| *.json text | ||
| *.toml text | ||
| *.xml text | ||
| *.yaml text | ||
| *.yml text | ||
|
|
||
| # Archives | ||
| *.7z binary | ||
| *.gz binary | ||
| *.tar binary | ||
| *.tgz binary | ||
| *.zip binary | ||
|
|
||
| # Text files where line endings should be preserved | ||
| *.patch -text | ||
|
|
||
| # | ||
| # Exclude files from exporting | ||
| # | ||
|
|
||
| .gitattributes export-ignore | ||
| .gitignore export-ignore | ||
| .gitkeep export-ignore | ||
|
|
||
| # Auto detect text files and perform LF normalization | ||
| * text=auto | ||
|
|
||
| *.cs text diff=csharp | ||
| *.cshtml text diff=html | ||
| *.csproj text eol=crlf | ||
| *.csx text diff=csharp | ||
| *.sln text eol=crlf | ||
|
|
||
| ############################################################################### | ||
| # Set default behavior to automatically normalize line endings. | ||
| ############################################################################### | ||
| * text=auto | ||
|
|
||
| ############################################################################### | ||
| # Set the merge driver for project and solution files | ||
| # | ||
| # Merging from the command prompt will add diff markers to the files if there | ||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | ||
| # the diff markers are never inserted). Diff markers may cause the following | ||
| # file extensions to fail to load in VS. An alternative would be to treat | ||
| # these files as binary and thus will always conflict and require user | ||
| # intervention with every merge. To do so, just comment the entries below and | ||
| # uncomment the group further below | ||
| ############################################################################### | ||
|
|
||
| *.csproj text eol=crlf | ||
| *.dbproj text eol=crlf | ||
| *.fsproj text eol=crlf | ||
| *.lsproj text eol=crlf | ||
| *.modelproj text eol=crlf | ||
| *.sln text eol=crlf | ||
| *.sqlproj text eol=crlf | ||
| *.vbproj text eol=crlf | ||
| *.vcproj text eol=crlf | ||
| *.vcxproj text eol=crlf | ||
| *.wixproj text eol=crlf | ||
| *.wwaproj text eol=crlf | ||
|
|
||
| *.filters text eol=crlf | ||
| *.props text eol=crlf | ||
| *.vcxitems text eol=crlf | ||
| *.xproj text eol=crlf | ||
|
|
||
|
|
||
| #*.csproj merge=binary | ||
| #*.dbproj merge=binary | ||
| #*.fsproj merge=binary | ||
| #*.lsproj merge=binary | ||
| #*.modelproj merge=binary | ||
| #*.sln merge=binary | ||
| #*.sqlproj merge=binary | ||
| #*.vbproj merge=binary | ||
| #*.vcproj merge=binary | ||
| #*.vcxproj merge=binary | ||
| #*.wixproj merge=binary | ||
| #*.wwaproj merge=binary | ||
|
|
||
| #*.filters merge=binary | ||
| #*.props merge=binary | ||
| #*.vcxitems merge=binary | ||
| #*.xproj merge=binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.