caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

merge

Browse source
This commit is contained in:
Andrei Vereha 2021-06-26 15:50:29 +02:00
parent 1018a41346
commit fc7c1bd957
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.idea/codeStyles/Project.xml
View file

@ -143,11 +143,8 @@
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<<<<<<< HEAD
<option name="RIGHT_MARGIN" value="120" />
=======
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
>>>>>>> upstream/dev
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="LINE_COMMENT_ADD_SPACE" value="true" />
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />