Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2019-03-05 23:51:35 +0300
committerMarek Safar <marek.safar@gmail.com>2019-03-06 10:34:01 +0300
commitb31a445e85523a9a41b0975203f7ccd1d6f185a8 (patch)
tree3fa9a395ceb204eb33a8abfd235b4c5e7b877633 /bcl.sln
parenteb3f7312bd4da3e6ca1e072c06fcb3f1338ad974 (diff)
[gitattributes] Do CRLF normalization on sln/proj files
They can be used with native line endings. We now have a shared folder with the dotnet repos and they have CRLF normalization enabled. This difference leads to conflicts while applying changes from the dotnet repos to mono.
Diffstat (limited to 'bcl.sln')
-rw-r--r--bcl.sln4
1 files changed, 2 insertions, 2 deletions
diff --git a/bcl.sln b/bcl.sln
index 728b6198dfe..281044ff370 100644
--- a/bcl.sln
+++ b/bcl.sln
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
MinimumVisualStudioVersion = 15.0.0.0
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jay", "mcs/jay/jay.vcxproj", "{5d485d32-3b9f-4287-ab24-c8da5b89f537}"
EndProject