Skip to content

Commit 143b3fc

Browse files
committed
Merge branch '7.0' into 7.1
# Conflicts: # Orm/Xtensive.Orm/Strings.Designer.cs # Orm/Xtensive.Orm/Strings.resx
2 parents e57a070 + 9d1e738 commit 143b3fc

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ indent_style = space
3535
tab_width = 2
3636

3737
# New line preferences
38-
end_of_line = crlf
3938
insert_final_newline = false
4039

4140
#### .NET Coding Conventions ####

0 commit comments

Comments
 (0)