diff --git a/.gitignore b/.gitignore index 58fcf1bd62..64fbe0761c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,12 +47,12 @@ captures/ .idea/dictionaries .idea/libraries .idea/jarRepositories.xml +.idea/codeStyles/Project.xml # Android Studio 3 in .gitignore file. .idea/caches .idea/modules.xml # Comment next line if keeping position of elements in Navigation Editor is relevant for you .idea/navEditor.xml -!.idea/codeStyles/** !.idea/editor.xml !/.idea/inspectionProfiles diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 4ce85a1565..602469c89d 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,41 @@