Skip to content

Commit 6637063

Browse files
committed
It seems I broke it
1 parent 962cb1a commit 6637063

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Settings.StyleCop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</CollectionProperty>
77
<BooleanProperty Name="AutoCheckForUpdate">False</BooleanProperty>
88
<BooleanProperty Name="WriteCache">False</BooleanProperty>
9-
<StringProperty Name="MergeSettingsFiles">Merge</StringProperty>
9+
<StringProperty Name="MergeSettingsFiles">Parent</StringProperty>
1010
</GlobalSettings>
1111
<Parsers>
1212
<Parser ParserId="StyleCop.CSharp.CsParser">

0 commit comments

Comments
 (0)