Skip to content

Commit 3ec556d

Browse files
authored
bro what the fuck is smalltalk
1 parent 84c0767 commit 3ec556d

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

.gitattributes

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# these files as binary and thus will always conflict and require user
2323
# intervention with every merge. To do so, just uncomment the entries below
2424
###############################################################################
25-
#*.sln merge=binary
25+
*.sln merge=binary
2626
#*.csproj merge=binary
2727
#*.vbproj merge=binary
2828
#*.vcxproj merge=binary
@@ -61,3 +61,12 @@
6161
#*.PDF diff=astextplain
6262
#*.rtf diff=astextplain
6363
#*.RTF diff=astextplain
64+
65+
# Projet files
66+
*.rsea linguist-language=RSEA
67+
*.slnx linguist-language=C#
68+
*.csproj linguist-language=C#
69+
*.vbproj linguist-language=Visual Basic
70+
*.fsproj linguist-language=F#
71+
*.pyproj linguist-language=Python
72+
*.sqlproj linguist-language=SQL

0 commit comments

Comments
 (0)