diff options
| author | Simon Rettberg | 2017-04-27 13:46:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-04-27 13:46:42 +0200 |
| commit | 8666590dd1184970bf8c93415e49f8f4be43ea5b (patch) | |
| tree | e9c0f1ba79b3400e98c6249daf61f8f519105f29 /.idea | |
| parent | [locationinfo] Clean up translations (diff) | |
| parent | Relax anti-caching headers a bit (diff) | |
| download | slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.tar.gz slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.tar.xz slx-admin-8666590dd1184970bf8c93415e49f8f4be43ea5b.zip | |
Merge branch 'master' into location-info-panel
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/codeStyleSettings.xml | 1 | ||||
| -rw-r--r-- | .idea/php.xml | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 9237b675..851e676d 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -47,6 +47,7 @@ <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_WRAP" value="5" /> <option name="DOWHILE_BRACE_FORCE" value="3" /> <option name="WHILE_BRACE_FORCE" value="3" /> <option name="FOR_BRACE_FORCE" value="3" /> diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 2a5958c5..00000000 --- a/.idea/php.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" /> - <component name="PhpUnit"> - <phpunit_settings> - <PhpUnitSettings load_method="CUSTOM_LOADER" /> - </phpunit_settings> - </component> -</project>
\ No newline at end of file |