diff options
| author | JF <jf@codingfield.com> | 2020-10-27 20:55:18 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-10-27 20:55:18 (GMT) |
| commit | 7de43a16608e599369867cb3cfa7d5776a5b6380 (patch) | |
| tree | 1750edfed02f547102e468eca485caab3b08e98d /.idea/codeStyles/Project.xml | |
| parent | 5983e33b8d7702800dc91a3229b9a7cee75eb006 (diff) | |
| parent | c5bf09d21b2ed8e2435ec625e351594f58713924 (diff) | |
Fix conflicts
Diffstat (limited to '.idea/codeStyles/Project.xml')
| -rw-r--r-- | .idea/codeStyles/Project.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index b3b93de..7bdfbcb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -7,6 +7,10 @@ <option name="INDENT_INSIDE_CODE_BLOCK" value="2" /> <option name="INDENT_DIRECTIVE_AS_CODE" value="true" /> <option name="SPACE_BEFORE_TEMPLATE_DECLARATION_LT" value="true" /> + <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" /> + <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" /> + <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" /> + <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" /> </Objective-C> <codeStyleSettings language="ObjectiveC"> <option name="RIGHT_MARGIN" value="140" /> |