From 689559bf6e650cba9e8fa84ed8d023eabfbe25ae Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Tue, 19 Dec 2023 12:04:09 +0100 Subject: [PATCH] chore: update git attributes and codeowners --- .gitattributes | 26 +++++++++++++------------- .github/CODEOWNERS | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1380690c7..0d361c171 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ # default for csharp files. # Note: This is only used by command line ############################################################################### -#*.cs diff=csharp +*.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files @@ -22,18 +22,18 @@ # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below ############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary +*.sln merge=binary +*.csproj merge=binary +*.vbproj merge=binary +*.vcxproj merge=binary +*.vcproj merge=binary +*.dbproj merge=binary +*.fsproj merge=binary +*.lsproj merge=binary +*.wixproj merge=binary +*.modelproj merge=binary +*.sqlproj merge=binary +*.wwaproj merge=binary ############################################################################### # behavior for image files diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f34878110..58cbf381e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,11 +7,11 @@ *.yml @Lulalaby *.ps1 @Lulalaby -*.targets @Aiko-IT-Systems/aitsys-leader -LICENSE.md @Aiko-IT-Systems/aitsys-leader -README.md @Aiko-IT-Systems/aitsys-leader +*.targets @Lulalaby +LICENSE.md @Lulalaby +README.md @Lulalaby -/.github/ @Lulalaby @NyuwBot @Aiko-IT-Systems/aitsys-leader +/.github/ @Lulalaby @NyuwBot #/DisCatSharp.Configuration/ @JBraunsmaJr #/DisCatSharp.Configuration.Tests/ @JBraunsmaJr