Merge conflict
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
# Override specific file types
|
||||
*.cs linguist-language=Rust
|
||||
*.sln linguist-documentation
|
||||
*.csproj linguist-documentation
|
||||
|
||||
# Or vendor all non-Rust files
|
||||
*.cs linguist-vendored
|
||||
*.js linguist-vendored
|
||||
*.py linguist-vendored
|
||||
@@ -7,3 +7,7 @@
|
||||
|
||||
.DS_STORE
|
||||
Storage/
|
||||
|
||||
*.sln
|
||||
*.cs
|
||||
*.csproj
|
||||
|
||||
Reference in New Issue
Block a user