Skip to content

Commit 36595c8

Browse files
committed
revert bad merge
1 parent d227b47 commit 36595c8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/EditorConfig.Core/FileConfiguration.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ internal FileConfiguration(Version version, string fileName, List<ConfigSection>
9090

9191
IndentStyle = Sections.LastOrDefault(s => s.IndentStyle.HasValue)?.IndentStyle;
9292
IndentSize = Sections.LastOrDefault(s => s.IndentSize != null)?.IndentSize;
93-
TabWidth = Sections.FirstOrDefault(s => s.TabWidth.HasValue)?.TabWidth;
94-
EndOfLine = Sections.FirstOrDefault(s => s.EndOfLine.HasValue)?.EndOfLine;
95-
Charset = Sections.FirstOrDefault(s => s.Charset.HasValue)?.Charset;
96-
TrimTrailingWhitespace = Sections.FirstOrDefault(s => s.TrimTrailingWhitespace.HasValue)?.TrimTrailingWhitespace;
97-
InsertFinalNewline = Sections.FirstOrDefault(s => s.InsertFinalNewline.HasValue)?.InsertFinalNewline;
98-
MaxLineLength = Sections.FirstOrDefault(s => s.MaxLineLength.HasValue)?.MaxLineLength;
93+
TabWidth = Sections.LastOrDefault(s => s.TabWidth.HasValue)?.TabWidth;
94+
EndOfLine = Sections.LastOrDefault(s => s.EndOfLine.HasValue)?.EndOfLine;
95+
Charset = Sections.LastOrDefault(s => s.Charset.HasValue)?.Charset;
96+
TrimTrailingWhitespace = Sections.LastOrDefault(s => s.TrimTrailingWhitespace.HasValue)?.TrimTrailingWhitespace;
97+
InsertFinalNewline = Sections.LastOrDefault(s => s.InsertFinalNewline.HasValue)?.InsertFinalNewline;
98+
MaxLineLength = Sections.LastOrDefault(s => s.MaxLineLength.HasValue)?.MaxLineLength;
9999

100100
//default tab_width to indent_size when indent size is a number
101101
if (IndentSize != null && IndentSize.NumberOfColumns.HasValue)

0 commit comments

Comments
 (0)