Skip to content

Commit c4ab6e5

Browse files
committed
Complete merge
1 parent 50804e5 commit c4ab6e5

File tree

3 files changed

+50
-32
lines changed

3 files changed

+50
-32
lines changed

.jscsrc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"preset": "google",
33
"disallowSpacesInsideObjectBrackets": null,
4-
"requireSpacesInsideObjectBrackets": "all",
4+
"requireSpacesInsideObjectBrackets": {
5+
"allExcept": [ "[", "]", "{", "}" ]
6+
},
57
"disallowSpacesInsideArrayBrackets": null,
6-
"requireSpacesInsideArrayBrackets": "all",
8+
"requireSpacesInsideArrayBrackets": {
9+
"allExcept": [ "[", "]", "{", "}" ]
10+
},
711
"disallowKeywordsOnNewLine": [ ],
812
"disallowMultipleVarDecl": null,
913
"maximumLineLength": 120,

material-decorator.js

+43-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)